110 files changed, 0 insertions, 5970 deletions

diff --git a/japanese/Makefile b/japanese/Makefile
index c4554167bcbd..b1a91256a04f 100644
--- a/japanese/Makefile
+++ b/japanese/Makefile
@@ -40,7 +40,6 @@
     SUBDIR += diclookup-emacs20
     SUBDIR += diclookup-mule
     SUBDIR += drpl
-    SUBDIR += dserver
     SUBDIR += dvi2dvi
     SUBDIR += dvi2ps
     SUBDIR += dvi2tty
@@ -55,13 +54,11 @@
     SUBDIR += ebnetd
     SUBDIR += ebview
     SUBDIR += ebview-gtk2
-    SUBDIR += ebw3
     SUBDIR += edict
     SUBDIR += edict-fpw
     SUBDIR += edict-utf-8
     SUBDIR += egg-canna
     SUBDIR += eijiro-fpw
-    SUBDIR += elisa10x8
     SUBDIR += elisa8x8
     SUBDIR += elisp-manual
     SUBDIR += elvis
@@ -114,7 +111,6 @@
     SUBDIR += ipa-ttfonts
     SUBDIR += ipadic
     SUBDIR += ircII
-    SUBDIR += iv
     SUBDIR += jadetex-ptex
     SUBDIR += japaneseAFM
     SUBDIR += jargon-fpw
@@ -224,7 +220,6 @@
     SUBDIR += monafonts-ttf
     SUBDIR += motoya-ttfonts
     SUBDIR += mozilla-jlp
-    SUBDIR += mozilla-jlp-devel
     SUBDIR += mplusfonts
     SUBDIR += msdosfs
     SUBDIR += mtools
@@ -276,7 +271,6 @@
     SUBDIR += onew-freewnn
     SUBDIR += onew-wnn6
     SUBDIR += onew-wnn7
-    SUBDIR += openoffice-templates
     SUBDIR += otojiro-fpw
     SUBDIR += p5-Date-Japanese-Era
     SUBDIR += p5-Jcode
@@ -291,7 +285,6 @@
     SUBDIR += paledit
     SUBDIR += pejv-fpw
     SUBDIR += perl5
-    SUBDIR += pgp.language
     SUBDIR += php_doc
     SUBDIR += phpgroupware
     SUBDIR += plain2
@@ -412,11 +405,6 @@
     SUBDIR += xemacs-devel-canna+wnn6
     SUBDIR += xemacs-devel-freewnn
     SUBDIR += xemacs-devel-wnn6
-    SUBDIR += xemacs21-canna
-    SUBDIR += xemacs21-canna+freewnn
-    SUBDIR += xemacs21-canna+wnn6
-    SUBDIR += xemacs21-freewnn
-    SUBDIR += xemacs21-wnn6
     SUBDIR += xjman
     SUBDIR += xjman-3
     SUBDIR += xjtext
@@ -437,6 +425,5 @@
     SUBDIR += zipcodes
     SUBDIR += zope-ejsplitter
     SUBDIR += zope-jamailhost
-    SUBDIR += zope-zmilocalizer
 
 .include <bsd.port.subdir.mk>
diff --git a/japanese/dserver/Makefile b/japanese/dserver/Makefile
deleted file mode 100644
index 9a34a0c74780..000000000000
--- a/japanese/dserver/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-# New ports collection makefile for:	dserver
-# Date created:		3 Nov 1996
-# Whom:			Mita Yoshio <mita@jp.FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	dserver
-PORTVERSION=	2.2.2
-PORTREVISION=	2
-CATEGORIES=	japanese
-MASTER_SITES=	ftp://ftp.pu-toyama.ac.jp/pub/misc/ \
-		${MASTER_SITE_PORTS_JP} \
-		ftp://ftp.sra.co.jp/pub/net/ndtp/misc/
-DISTNAME=	${PORTNAME}2.2betapl2
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		${DISTNAME}.addtable${EXTRACT_SUFX} \
-		kenjiro-ndtpd.diff \
-		kenjiro-dictlist.diff
-EXTRACT_ONLY=	${DISTFILES:Nkenjiro-*}
-
-MAINTAINER=	mita@jp.FreeBSD.org
-COMMENT=	CDROM dictionary server & clients
-
-RUN_DEPENDS=	jless:${PORTSDIR}/japanese/less
-
-BROKEN=		Unfetchable
-DEPRECATED=	${BROKEN}
-EXPIRATION_DATE=2005-09-22
-
-WRKSRC=		${WRKDIR}/${PORTNAME}
-USE_GMAKE=	yes
-
-.include <bsd.port.pre.mk>
-
-pre-patch:
-	${PATCH} -d ${WRKSRC}/clients -E  < ${DISTDIR}/kenjiro-ndtpd.diff
-	${PATCH} -d ${WRKSRC}/clients -E  <  ${DISTDIR}/kenjiro-dictlist.diff
-
-post-install:
-	@${SED} s!PREFIX_DIR!${PREFIX}!g ${WRKSRC}/setup.sh.template \
-	  > ${PREFIX}/lib/dserver/setup.sh
-	@${SED} s!PREFIX_DIR!${PREFIX}!g ${WRKSRC}/deinstall.sh.template \
-	  > ${PREFIX}/lib/dserver/deinstall.sh
-	@${INSTALL_DATA} ${FILESDIR}/README.FreeBSD-setup.euc ${PREFIX}/lib/dserver/doc/
-	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGREQ} ${PKGNAME} INSTALL
-
-.include <bsd.port.post.mk>
diff --git a/japanese/dserver/distinfo b/japanese/dserver/distinfo
deleted file mode 100644
index 9730a2f70b61..000000000000
--- a/japanese/dserver/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-MD5 (dserver2.2betapl2.tar.gz) = d060ac3965c383a40a7ecfa95470e922
-SIZE (dserver2.2betapl2.tar.gz) = 158595
-MD5 (dserver2.2betapl2.addtable.tar.gz) = c238b0189ce67b584c04f545cf52b65b
-SIZE (dserver2.2betapl2.addtable.tar.gz) = 1124
-MD5 (kenjiro-ndtpd.diff) = 6051d885869ea480f8aba388a6e838e5
-SIZE (kenjiro-ndtpd.diff) = 1170
-MD5 (kenjiro-dictlist.diff) = a1f85d031a298f7bd1858c24cb0521ac
-SIZE (kenjiro-dictlist.diff) = 6367
diff --git a/japanese/dserver/files/README.FreeBSD-setup.euc b/japanese/dserver/files/README.FreeBSD-setup.euc
deleted file mode 100644
index c32b72c80a65..000000000000
--- a/japanese/dserver/files/README.FreeBSD-setup.euc
+++ /dev/null
@@ -1,329 +0,0 @@
-                 Dserver FreeBSD portセットアップについて．
-
-                                                             3.Nov.1996
-						Revised	    20.Dec.1996
-						Revised	    31.Jan.1998
-                                         三田吉郎 <mita@jp.FreeBSD.org>
-	     Special thanks to MIHIRA Yoshiro <sanpei@yy.cs.keio.ac.jp>
-
-	目次
-	I. インストール
-	   I.1. setup.sh の具体的な作業
-	   I.2. 辞書のコピー・マウント
-	   I.3. dserver_access ファイルの整備
-	   I.4. サーバの動作テスト
-	II. 使う
-	   II.1. kenjiro
-	III. 削除(uninstall)
-	IV. `inetd起動のdserver'を作る方法
-	    IV.1. `inetd起動のdserverとは何か'
-	    IV.2. standaloneとinetdと，どちらを選択するか．
-	    IV.3. inetd起動のdserverを作る．
-	    IV.4. 初期設定スクリプトの違い．
-	V. エラーとその対策
-	    V.1. 辞書を10種類以上にしたら途端にBus Errorで落っこちます．
-
-※ 文中の${PREFIX}は，/usr/localに読み変えてください，portsを利用して
-   コンパイルすると，${PREFIX}を/usr/local以外にも，自分の好みの
-   ディレクトリに設定することができます．
-
-I. インストール
-
-    dserver の ports を インストールした後に必要な作業は次の通りで
-  す.
-
-	1: [/etc/services] に ndtp プロトコルのエントリを追加
-	2: dserver 起動用スクリプトの準備
-	3: 辞書をコピーまたはマウント
-
-    これらの作業は, [${PREFIX}/lib/dserver/setup.sh] を起動すると, 1〜
-  2 までを自動的に設定してくれます．
-
-  ※ ${PREFIX}
-     ここで ${PREFIX} とは ports をコンパイル時の環境変数 PREFIX を
-     示します. packages では, [/usr/local] となります.  上記の場合,
-     [/usr/local/lib/dserver/setup.sh] と適時読みかえてください. 
-
-I.1. setup.sh の具体的な作業
-
-    この setup.sh では, 具体的に次の作業を行います.
-
-1: [/etc/services] の末尾に次の行を追加します.  
-
------
-ndtp	2010/tcp	#Network Dictionary Transfer Protocol
------
-   ※ この行は, dserver を利用する*全てのマシン*に追加する必要があります.
-
-2: [${PREFIX}/etc/rc.d/dserver.sh] に次の行を追加します. 
-
-    これにより, OS ブート時に dserver が自動的に起動します.
-
------
-#!/bin/sh
-# dserver - dictionary server
-case "$1" in
-start)
-	if [ -x /usr/local/lib/dserver/dserver ] ; then
-		/usr/local/lib/dserver/dserver &
-		echo -n ' dserver'
-	fi
-	;;
-stop)
-	;;
-*)
-	echo "Usage: setup.sh.standalone {start|stop}" >&2
-	exit 64
-	;;
-esac
-
-exit 0
------
-
-I.2. 辞書のコピー・マウント
-
-    [${PREFIX}/share/dict/cdrom/] に，それぞれの辞書をマウントします．
-  [${PREFIX}/lib/dserver/dserver_access] のエントリと整合性を持たせる
-  ようにしてください．
-
-    makedic というプログラムを使うと，辞書サイズを概ね 1/3 に圧縮す
-  ることができます．使い方は簡単で次の通りです. 
-
------
-makedic [オリジナルの辞書ファイル名] [新しい辞書ファイル名]
------
-
-  ※: 辞書のライセンスによる圧縮の制限
-      辞書をハードディスクにコピー，圧縮してよいかどうかの対応ですが， 
-    広辞苑は×，研究社の事典は○であるなどと，各社異なります．
- [${PREFIX}/lib/dserver/doc/README.dserver] を御覧下さい．
-
-I.3. dserver_access ファイルの整備
-    dserver は, ${PREFIX}/lib/dserver/dserver_access というファイルで,
-        1. どのマシンからのアクセスを受け付けるか
-        2. どういう名前のファイルを辞書ファイルとして登録するか, 
-           その辞書ファイルへ何人のアクセスを同時に受けるか,
-           辞書内部に埋め込まれた外字を, どうやって真似て表示するか
-    といった情報を取得します.  従って, このファイルは自分で書く必要があります.
-
-   一行一行, 辞書エントリやアクセス許可ホスト名を並べて書きます.
-   順番はどうでもいいです.
-  附属の ${PREFIX}/lib/dserver/dserver_access が参考になるでしょう.
-   1. どのホストからのアクセスを受け付けるか
-        アクセスを受け付けるホスト名を書きます.
-
------
-localhost 
------
-
-        とするのが一般的で, こうすると dserver をインストールした
-        そのホストからアクセスできるようになります.  
-   2. 辞書のエントリ
-
------
-#DICT eiwa /cdrom/chujiten/data/honmon "研究社中英和" 25 600
-#DICT waei /cdrom/chujiten/data/honmon "研究社中和英" 25 600
------
-
-のように, #DICT につづけて, 辞書にアクセスするための名前,
-辞書本体のファイルのありか, 辞書名, 同時にアクセスできるユーザ数,
-タイムアウトまでの時間を記入します.  
-
-ところで, 以上の例は, 
-パシフィックハイテックさん htt://www.pht.co.jp/ が出している,
-FreeBSD Pro 2.2.6-R に付いてくる, EPWING 版 研究社新英和辞典6.4版
-用の設定です. それで, この辞書で, 別 port になっている diclookup-mule
-(ja-diclookup-mule*という名前です) 和英検索をするためには, 
-${PREFIX}/lib/dserver/waei.tbl というファイルの先頭の,
-
------
-#kana=hyouki
------
-
-という行のコメントを外して,
-
------
-kana=hyouki
------
-
-とする必要があります. 参考までに.
-
-I.4. サーバの動作テスト
-
-    desrver を立ち上げると，dserver が使えるようになるはずです．次の
-   ように打ち込んで，簡単な接続試験をしてみましょう．
-
------
-telnet localhost ndtp<リターン>
------
-
-1: 接続試験その 1, アクセス可能かどうか
-
-    接続した上で A<リターン> と打ち込むと，[dserver_access] ファイル
-  でアクセス許可が出ている場合は $A という返事が帰って来るはずです．
-
------
-% telnet localhost ndtp
-lavender: {1234} telnet localhost ndtp
-Trying 127.0.0.1...
-Connected to localhost.
-Escape character is '^]'.
-A
-$A
------
-
-  ※: アクセス許可ファイルの記述の注意
-
-      dserver の仕様として, アクセス許可のチェックは IP アドレスでは
-    なく, ホストネームで行われています. そのため, 次の場合例のように 
-    localhost とだけ書いてもうまくアクセス許可を得れない場合がありま
-    す.
-
-	0) [/etc/hosts] に次のような行が含まれる. 
-
-例
---------
-127.0.0.1               localhost.rad.cc.keio.ac.jp localhost dserver
---------
-
-	0-1) DNS が使える環境であるが, [/etc/host.conf] で bind より 
-           hosts を先に書いている場合. 
-
-	0-2) DNS を使えず [/etc/hosts] だけを参照する場合. 
-
-      その場合には, 次のように [dserver_access] に記述するとアクセス
-    許可を得れます.
-
-例: [/etc/hosts] が上記のような場合. 適時 rad.cc.keio.ac.jp. を追加
-してください. 
------
-localhost.rad.cc.keio.ac.jp
------
-
-2: 接続試験その 2,  辞書が使用可能かどうか?
-
-    アクセス許可を得た後，T<リターン> と打ち込むと，使用可能な辞書の
-  リストを得ることができます．
-
-辞書リストの例:
------
-T
- 1      研究社中和英
- 2      研究社中和英
- 3      三省堂クラウン仏和
-$*
------
-
-    辞書をインストールしたにも関わらず利用可能になっていない場合は，
-  [dserver_access] ファイルと，CDROM のディレクトリ構造を確認してみ
-  てください．辞書ファイルは，start とか hommon とかいう名前になって
-  いますが，このインストール位置が狂っているばあいがよくあります．
-
-   リスト中の漢字は，EUC漢字コードを使っていますので，
-   ktermを`kterm -km euc'で立ちあげたり，ctrl+中ボタンを押して
-   選択するなどして，EUC漢字コードを表示できるようにしてください．
-
-II. 使う
-
-II.1. kenjiro
-
-    コマンドラインから引きたい場合は kenjiro<リターン> です．
-  【指定辞書無し】と出たときに<ESC>キーを押すと辞書が選択できます．
-
-    リストに無い辞書を読みたい場合は，ports を用意して make patch の
-  後 [${WRKSRC}/clients/kenjiro/config.h] を書き換えてmakeし直します．
-
-III. 削除(uninstall)
-
-    削除は，インストールの逆を行えばよいわけですが，3-1 を自動的に行
-  うためのシェルスクリプト，[${PREFIX}/lib/dserver/deinstall.sh] を
-  用意しておきました．
-
-    その後で，pkg_deleteを行えばOKのはずです．
-
-IV. `inetd起動のdserver'を作る
-    このportsでは，特に指定しない限り`standaloneのdserver'を
-    作るようにしていますが，`inetd起動のdserver'を作ることもできます．
-
-IV.1 `inetd起動のdserver'とは何か?
-
-    これまで説明してきた例では，このportsでの標準設定である，
-    dserverをstandaloneで使用するための設定を紹介してきました．
-
-    standaloneでは，プログラムdserverシステムを起動したときから，
-    システムが終了する時までずっと走っていて，「全ての接続要求を
-    一つのdserverが処理」します．
-
-    inetdでは，プログラムdserverは普段は走っておらず，接続要求がくるたびに
-    inetdから起動されます．「別々の接続要求は別々のdserverが処理」します．
-
-IV.2. standaloneとinetdと，どちらを選択するか．
-    ライセンス制限(ファイルdserver_accessで，辞書を同時に読めるユーザ数を
-    制限できる機能です)を使うためには，全ての接続要求を一つのdserverが
-    処理する必要があるので，standaloneで立ちあげる必要があります．
-
-    inetdでは，dserverを使っていないときにCDROMを差し替えることができます．
-    amdと組み合わせるのが便利です．
-
-IV.3. inetd起動のdserverを作る．
-
-    rootになって，/usr/ports/japanese/dserverのディレクトリで，
------
-make package
------
-    と入力すると，ファイルを展開した後に，
-    standaloneでdserverを動かすように設定するか，それとも
-    inetdから接続するたびに呼び出すように設定するかの
-    選択画面になります．
-
------------------ dserver port configuration -----------------
-| How do you want to run dserver, standalone or run by inetd?|
-|                                                            |
-|                  (*) standalone  stanalone                 |
-|                  ( ) inetd       inetd                     |
-|                                                            |
-|                    [  OK  ]       Cancel                   |
---------------------------------------------------------------
-    普段はこの画面のように，standaloneで起動する設定になっていますが，
-    上下カーソルとリターンキーでinetdを選択すると，
-    inetdから呼び出す設定になります(下図はinetdを選択したところ)
-
------------------ dserver port configuration -----------------
-| How do you want to run dserver, standalone or run by inetd?|
-|                                                            |
-|                  ( ) standalone  stanalone                 |
-|                  (*) inetd       inetd                     |
-|                                                            |
-|                    [  OK  ]       Cancel                   |
---------------------------------------------------------------
-
-IV.4. 初期設定スクリプトの違い．
-
-    初期設定スクリプトsetup.sh, deinstall.shは，
-    inetd起動を選択した場合とstandaloneを選択した場合とで違ったものが
-    インストールされます．
-
-    inetd起動用のsetup.shでは，standaloneに比べて以下の点が異なっています．
-* /usr/local/etc/rc.d/dserver.shを作成しない．
-* /etc/inetd.confへのdserverのエントリを追加する．
-* inetdを立ちあげ直す(HUPシグナルを送る)
-
-   使い方はinetd, standalone用とも一緒です．
-
-V. エラーとその対策
-V.1. 辞書を10種類以上にしたら途端にBus Errorで落っこちます．
-
-    server2.2-pl2/config.hの，MAXDICTの値を10から増やして
-    コンパイルし直しましょう．
-※dserver_accessファイルの設定を変更している場合，バックアップしておきます．
------
-% su root
-#cp /usr/local/lib/dserver/dserver_access /tmp/dserver_access.orig
-# cd /usr/ports/japanese/dserver
-# make patch
-# vi work/dserver/server2.2-pl2/config.h
-# make install
-#cp /tmp/dserver_access.orig /usr/local/lib/dserver/dserver_access 
------
-
-質問，不平不満など御座いましたらmita@jp.FreeBSD.orgにどうぞ．
diff --git a/japanese/dserver/files/deinstall.sh.inetd b/japanese/dserver/files/deinstall.sh.inetd
deleted file mode 100644
index 55e4c28ecc49..000000000000
--- a/japanese/dserver/files/deinstall.sh.inetd
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-echo "updating /etc/services"
-cp /etc/services /etc/services.bak
-(grep -v '\bndtp\b' /etc/services.bak) > /etc/services
-echo "updating /etc/inetd.conf"
-cp /etc/inetd.conf /etc/inetd.conf.bak
-(grep -v '\bndtp\b' /etc/inetd.conf.bak) > /etc/inetd.conf
diff --git a/japanese/dserver/files/deinstall.sh.standalone b/japanese/dserver/files/deinstall.sh.standalone
deleted file mode 100644
index 841ea86cc426..000000000000
--- a/japanese/dserver/files/deinstall.sh.standalone
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-echo "updating /etc/services"
-cp /etc/services /etc/services.bak
-(grep -v '\bndtp\b' /etc/services.bak) > /etc/services
-echo "Removing PREFIX_DIR/etc/rc.d/dserver.sh"
-rm -f PREFIX_DIR/etc/rc.d/dserver.sh
diff --git a/japanese/dserver/files/patch-aa b/japanese/dserver/files/patch-aa
deleted file mode 100644
index f95b3cbfb1f8..000000000000
--- a/japanese/dserver/files/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
---- /dev/null	Sat Jan 31 09:42:25 1998
-+++ Makefile	Sat Jan 31 09:43:12 1998
-@@ -0,0 +1,12 @@
-+PREFIX?=/usr/local
-+DOCDIR=${PREFIX}/lib/dserver/doc
-+all:
-+	(cd server2.2-pl2; ${MAKE} all)
-+	(cd clients/kenjiro; ${MAKE} all)
-+install:
-+	if  [ ! -d ${DOCDIR} ] ; then mkdir -p ${DOCDIR} ; fi
-+	(cd server2.2-pl2; ${MAKE} install)
-+	(cd clients/kenjiro; ${MAKE} install)
-+	cp ACKNOWLEDGMENT DICTIONARIES doc/*  ${PREFIX}/lib/dserver/doc
-+	cp clients/kenjiro/Copyright ${DOCDIR}/Copyright.kenjiro
-+	cp clients/kenjiro/README ${DOCDIR}/README.kenjiro
diff --git a/japanese/dserver/files/patch-ab b/japanese/dserver/files/patch-ab
deleted file mode 100644
index e3ee994afa3d..000000000000
--- a/japanese/dserver/files/patch-ab
+++ /dev/null
@@ -1,603 +0,0 @@
-patches for server2.2-pl2
---- server2.2-pl2/daemon.c.orig	Sat Jan 31 09:53:47 1998
-+++ server2.2-pl2/daemon.c	Sat Jan 31 09:53:20 1998
-@@ -13,6 +13,11 @@
- #include <sys/time.h>
- #include <ctype.h>
- 
-+#ifdef __FreeBSD__
-+#include <stdlib.h>
-+#include <string.h>
-+#endif
-+
- #ifdef linux
- #include <string.h>
- #include <stdlib.h>
-@@ -34,7 +39,6 @@
- #include "ndtp.h"
- #include "misc.h"
- 
--
- #ifdef DEBUG
- extern int debug;
- #endif
-@@ -104,8 +108,11 @@
- #endif
- 		exit(1);
- 	}
--
-+#ifdef __FreeBSD__
-+	if( bind(ls, (struct sockaddr *)&myaddr_in, sizeof(struct sockaddr_in)) == -1)  {
-+#else
- 	if( bind(ls, &myaddr_in, sizeof(struct sockaddr_in)) == -1)  {
-+#endif
- #ifdef SYSLOG
- 		syslog(LOG_ERR,"Unable to bind address /iserver_init\n");
- #endif
---- server2.2-pl2/lookup.c.orig	Fri Aug  9 19:10:32 1996
-+++ server2.2-pl2/lookup.c	Sat Jan 31 11:29:09 1998
-@@ -267,13 +267,25 @@
- 	}
- }
- 
--dict_read(dict,ptr,size,count)
-+static int
-+dict_read_new(Dict *dict,char *ptr,int size,int count)
-+/* dict_read only for showhonmon function */
-+{
-+  int	i;
-+  size *= count;
-+  for( i=0; i<size; i++,ptr++ ) {
-+    *ptr = dic_getc(dict);
-+  }
-+}
-+
-+static int
-+dict_read_old(dict,ptr,size,count)
- Dict *dict;
- char *ptr;
- {
- 	int s;
- #ifdef DEBUG
--  printf( "dict_read size[%d] mode[%d]\n", size, dict->compress_type );
-+  printf( "dict_read_old size[%d] mode[%d]\n", size, dict->compress_type );
- #endif
- 	if (dict->compress_type == COMPRESS_TYPE_EDIC) {
- 		size *= count;
-@@ -374,12 +386,12 @@
- 
- 	} else {
- 		dict_seekframe(dict,1);
--		if(dict_read(dict,index[0],BS,1)!=1) return -1;
-+		if(dict_read_old(dict,index[0],BS,1)!=1) return -1;
- 		e = TWOBYTEUINT(index[0]);
- 		dict->index = NULL;
- 
- 		for(; e>0; e--) {
--		    if(dict_read(dict,index[0],BS,1)!=1) return -1;
-+		    if(dict_read_old(dict,index[0],BS,1)!=1) return -1;
- 		    if(!bcmp(index[0],null,BS)) break;
- 
- 		    new = (Index *)calloc(1,sizeof(Index));
-@@ -501,6 +513,55 @@
- 	else return q+6;
- }
- 
-+#ifdef HALF
-+reg_jisstrnsub_(s,t,r,n,CODE)
-+unsigned char *s, *t;
-+int r,n;
-+int CODE;
-+{
-+	unsigned int ss,tt;
-+	if (CODE == FULL) {
-+	  for(; ; s+=2,t+=2,n-=2) {
-+	    ss = (*s&0x7f)<<8|*(s+1)&0x7f;
-+	    tt = (*t&0x7f)<<8|*(t+1)&0x7f;
-+	    if (n <= 0)  tt = 0; /* string terminate 95.2.8 by T.Motoda */
-+	    
-+		if(r==SHORT && (ss=='*' || ss=='?')) {
-+			return 0;
-+		}
-+		if(r==WHOLE && (ss=='*')) {
-+			return 0;
-+		}
-+		if(!ss || !tt) break;
-+		if(r==WHOLE && (ss=='?')) {
-+			continue;
-+		}
-+		if(ss!=tt) break;
-+	  }
-+	} else {
-+	  for(; ; s++,t++,n--) {
-+	    ss = (*s);
-+	    tt = (*t);
-+	    if (n <= 0)  tt = 0; /* string terminate 95.2.8 by T.Motoda */
-+	    if(tt==0x20 && *(t+1)==0)tt=0; /* Delete last ' ' */
-+	    
-+		if(r==SHORT && (ss=='*' || ss=='?')) {
-+			return 0;
-+		}
-+		if(r==WHOLE && (ss=='*')) {
-+			return 0;
-+		}
-+		if(!ss || !tt) break;
-+		if(r==WHOLE && (ss=='?')) {
-+			continue;
-+		}
-+		if(ss!=tt) break;
-+	  }
-+	}
-+	return ss-tt;
-+}
-+#endif
-+
- findentry_int(key,realkey,frm,env_p)
- unsigned char *key,*realkey;
- ENV *env_p;
-@@ -509,6 +570,9 @@
- 	unsigned char frame[FRAMESIZE+2];
- 	static char msg[32];
- 	Dict *dict;
-+#ifdef HALF
-+	int CODE=dict_set[env_p->dict_num].code; /* FULL or HALF */
-+#endif
- 
- 	dict=env_p->dict;
- 
-@@ -542,12 +606,21 @@
- 				putnstr(q,s);
- 				printf("\n");
- #endif
-+#ifdef HALF
-+				if(reg_jisstrnsub_(key,q,SHORT,s,CODE)<=0) {
-+					findentry_int(key,realkey,FOURBYTEUINT(q+s),env_p);
-+				}
-+				if(reg_jisstrnsub_(key,q,SHORT,s,CODE)<0) {
-+					return;
-+				}
-+#else
- 				if(reg_jisstrnsub(key,q,SHORT,s)<=0) {
- 					findentry_int(key,realkey,FOURBYTEUINT(q+s),env_p);
- 				}
- 				if(reg_jisstrnsub(key,q,SHORT,s)<0) {
- 					return;
- 				}
-+#endif
- 			}
- 		}
- 		else if(frame[1]==0) {
-@@ -625,7 +698,11 @@
- 						putnstr(q,s);
- #endif
- 						if(!match) {
-+#ifdef HALF
-+							match=!reg_jisstrnsub_(realkey,q,WHOLE,s,CODE);
-+#else
- 							match=!reg_jisstrnsub(realkey,q,WHOLE,s);
-+#endif
- 						}
- 						q+=s;
- #ifdef DEBUG
-@@ -644,7 +721,11 @@
- 					putnstr(q,s);
- #endif
- 					if(!match) {
-+#ifdef HALF
-+						match=!reg_jisstrnsub_(realkey,q,WHOLE,s,CODE);
-+#else
- 						match=!reg_jisstrnsub(realkey,q,WHOLE,s);
-+#endif
- 					}
- #ifdef DEBUG
- 					putchar('\n');
-@@ -722,6 +803,28 @@
- #endif
- }
- 
-+static void myGetHiLo( dict, env_p, hi, lo )
-+Dict *dict;
-+ENV *env_p;
-+int *hi;	/*(out)*/
-+int *lo;	/*(out)*/
-+{
-+  int	c;
-+
-+  c = dic_getc(dict);
-+  if( c == 0x1f ||
-+      dict_set[env_p->dict_num].code == FULL) {
-+    *hi = c;
-+    *lo = dic_getc(dict);
-+  } else {
-+    *lo = c;
-+    if ( *lo < 32) {
-+       *hi = *lo;
-+       *lo = dic_getc(dict);
-+    } else *hi = 0x23;
-+  }
-+}
-+
- showhonmon(frm,ofs,raw,env_p)
- ENV *env_p;
- {
-@@ -742,7 +845,6 @@
- 	int half, height,width ,ref, count, fig,size;
- 	int i,j;
- 	char c;
--
- 	fig = FALSE;
- 	half= dict_set[env_p->dict_num].code ? 1 : 0;
- 	dict=env_p->dict;
-@@ -774,17 +876,20 @@
- 
- 	  if( dic_seek(dict,frm,ofs) ) return;
- 
--	  hi = dic_getc(dict);            /* Fetch */
--          lo = dic_getc(dict);
-+	/*hi = dic_getc(dict);            ** Fetch */
-+	/*lo = dic_getc(dict);*/
-+	  myGetHiLo( dict, env_p, &hi, &lo );
- 	  while(!(hi==0x1f && lo==0x02) && 	/* if Doc start */
- 	        !(hi==0x1f && lo==0x41) && 	/* if Key start */
- 	        !(hi==0x1f && lo==0x45)) {	/* if Fig start */
-+		if( hi!=0x1f ) { goto loop1; }
- 		if(hi==0x1f && lo==0x09){        /* if not  /* if TAB  skip 2byte */
-                        	hi = dic_getc(dict);
-                        	lo = dic_getc(dict);
-                 }
--		hi = dic_getc(dict);
--		lo = dic_getc(dict);
-+	      /*hi = dic_getc(dict);*/
-+	      /*lo = dic_getc(dict);*/
-+		myGetHiLo( dict, env_p, &hi, &lo );
- 	  }
- 	 /* Doc ,Key or Fig start */
- 	  /* if Key start */
-@@ -799,7 +904,7 @@
- 	     fig=TRUE;
- 	  }
- 
--	    if (dict_set[env_p->dict_num].code == FULL) {
-+	  /*if (dict_set[env_p->dict_num].code == FULL) {
-                 hi = dic_getc(dict);
-                 lo = dic_getc(dict);
-             } else {
-@@ -808,8 +913,9 @@
-                      hi = lo;
-                      lo = dic_getc(dict);
-                 } else hi = 0x23;
--            }
--	  
-+            }*/
-+	    myGetHiLo( dict, env_p, &hi, &lo );
-+loop1:
- 	  while(!(hi==0x00 && 
- 		   lo==dict_set[env_p->dict_num].endcode &&
- 		    TAB ) /* 1f09(tab)+0001 -> end */ 
-@@ -867,7 +973,7 @@
- 	      case 0x31:	/* fig start */
- 	 	hi = dic_getc(dict);
- 	 	lo = dic_getc(dict);
--		dict_read(dict,rbuf,4,1);
-+		dict_read_new(dict,rbuf,4,1);
- 		/* fread(rbuf,4,1,dict->stream); */
- 		height = TWOBCDUINT(rbuf);
- 		width  = TWOBCDUINT(rbuf+2);
-@@ -877,7 +983,7 @@
- 	 		hi = dic_getc(dict);
- 	 		lo = dic_getc(dict);
- 	        } while(!(hi==0x1f && lo==0x51 ));
--		dict_read(dict,rbuf,6,1);
-+		dict_read_new(dict,rbuf,6,1);
- 		/*fread(rbuf,6,1,dict->stream); */
- 		frmtmp = FOURBCDUINT(rbuf);
- 		ofstmp  = TWOBCDUINT(rbuf+4);
-@@ -903,7 +1009,7 @@
- 	       case 0x44:	/* fig start */
- 	 	hi = dic_getc(dict);
- 	 	lo = dic_getc(dict);
--		dict_read(dict,rbuf,8,1);
-+		dict_read_new(dict,rbuf,8,1);
- 		/* fread(rbuf,8,1,dict->stream); */
- 		height = FOURBCDUINT(rbuf);
- 		width  = FOURBCDUINT(rbuf+4);
-@@ -916,21 +1022,21 @@
- 		  lo = dic_getc(dict);
- 		break;
- 	      case 0x48:	/*  music ref start */
--		dict_read(dict,rbuf,10,1);
-+		dict_read_new(dict,rbuf,10,1);
- 		/*fread(rbuf,10,1,dict->stream); */
- 		frmtmp=(unsigned long int)SIXBCDUINT(rbuf);
- 		ofstmp=FOURBCDUINT(rbuf+6);
- 		write(cur_s,buf,strlen(buf));
- 		break;
- 	      case 0x51:	/* pointer to fig page:offset(BCD)*/
--		dict_read(dict,rbuf,6,1);
-+		dict_read_new(dict,rbuf,6,1);
- 		frmtmp=FOURBCDUINT(rbuf);
- 		ofstmp=TWOBCDUINT(rbuf+4);
- 		sprintf(buf,"<%x:%x>",frmtmp,ofstmp);
- 		write(cur_s,buf,strlen(buf));
- 		break;
- 	      case 0x52:	/* picture end with page:offset(BCD)*/
--		dict_read(dict,rbuf,6,1);
-+		dict_read_new(dict,rbuf,6,1);
- 		frmtmp=FOURBCDUINT(rbuf);
- 		ofstmp=TWOBCDUINT(rbuf+4);
- 		sprintf(buf,"<%x:%x>",frmtmp,ofstmp);
-@@ -939,7 +1045,7 @@
- 	      case 0x53:	/* end with page:offset(BCD)*/
- 		ref   = FALSE;
- 		if(fig==FALSE){ 
--		  dict_read(dict,rbuf,8,1);
-+		  dict_read_new(dict,rbuf,8,1);
- 		  frmtmp=FOURBCDUINT(rbuf);
- 		  ofstmp=FOURBCDUINT(rbuf+4);
- 		  sprintf(buf,"<%x:%x>",frmtmp,ofstmp);
-@@ -958,7 +1064,7 @@
- 	      case 0x62:	/* refrence end with page:offset(BCD) */
- 	      case 0x63:	/* menu end with page:offset(BCD) */
- 		ref   = FALSE;
--		dict_read(dict,rbuf,6,1);
-+		dict_read_new(dict,rbuf,6,1);
- 		frmtmp=FOURBCDUINT(rbuf);
- 		ofstmp=TWOBCDUINT(rbuf+4);
- 		sprintf(buf,"<%x:%x>",frmtmp,ofstmp);
-@@ -966,7 +1072,7 @@
- 		break;
- 	      case 0x64:	/* fig ref  end with page:offset(BCD) */
- 		honmon = TRUE;
--		dict_read(dict,rbuf,6,1);
-+		dict_read_new(dict,rbuf,6,1);
- 		frmtmp=FOURBCDUINT(rbuf);
- 		ofstmp=TWOBCDUINT(rbuf+4);
- 		sprintf(buf,"<%x:%x>",frmtmp,ofstmp);
-@@ -998,7 +1104,7 @@
- 	       puteucz2h(cur_s,hi,lo,env_p->dict_num);
- 	    }
- 
--	    if (dict_set[env_p->dict_num].code == FULL) {
-+	  /*if (dict_set[env_p->dict_num].code == FULL) {
-                 hi = dic_getc(dict);
-                 lo = dic_getc(dict);
-             } else {
-@@ -1007,7 +1113,8 @@
-                      hi = lo;
-                      lo = dic_getc(dict);
-                 } else hi = 0x23;
--            }
-+            }*/
-+	    myGetHiLo( dict, env_p, &hi, &lo );
- 	  }
- 	}
- 	write(cur_s,"\n",1);
-@@ -1108,7 +1215,7 @@
-     }
-   } else {
-     dict_seekframe(dict,frm);
--    dict_read(dict, buff, FRAMESIZE, 1);
-+    dict_read_old(dict, buff, FRAMESIZE, 1);
-   }
-   return 1;
- 
---- server2.2-pl2/Makefile.orig	Sat Jan 31 09:53:35 1998
-+++ server2.2-pl2/Makefile	Sat Jan 31 09:53:20 1998
-@@ -2,33 +2,39 @@
- #CC=cc
- CC=gcc
- 
--DSERVERTOPDIR=/usr/local/etc/dserverdir
-+DSERVERTOPDIR=${PREFIX}/lib/dserver
- #DSERVERTOPDIR=/nfs/home40/usui/dserver/server2.2-current/table
--DICTROOT=/usr/local/dict
-+DICTROOT=${PREFIX}/share/dict
- ACCESSFILE=${DSERVERTOPDIR}/dserver_access
- 
--BINDIR=/usr/local/lib
-+BINDIR=${PREFIX}/lib/dserver
-+DOCDIR=${DSERVERTOPDIR}/doc
-+LISPLIB=${PREFIX}/lib/mule/site-lisp
- #LISPLIB=/usr/local/lib/Nemacs/lisp #usui
- 
- DEFS=-D'ACCESSFILE="$(ACCESSFILE)"' \
---D'DSERVERTOPDIR="$(DSERVERTOPDIR)"'
-+-D'DSERVERTOPDIR="$(DSERVERTOPDIR)"' -DHALF
- 
- # define AUTH for auth
- # define DICLOOKUPMULE for mule
--OFLAG=
--CFLAGS= $(OFLAG) -DSTANDALONE $(DEFS) -DDEBUG -DSYSLOG
--CFLAGS=-Dsparc $(OFLAG) -DSYSLOG -DSTANDALONE $(DEFS)
-+OFLAG= -O2
-+#CFLAGS= $(OFLAG) -DSTANDALONE $(DEFS) -DDEBUG -DSYSLOG
-+#CFLAGS=-Dsparc $(OFLAG) -DSYSLOG -DSTANDALONE $(DEFS)
- #CFLAGS=-Dsparc $(OFLAG) -DSYSLOG -DAUTH -DDICLOOKUPMULE -DSTANDALONE $(DEFS)
--CFLAGS=-Dsparc $(OFLAG) -DSYSLOG -DSTANDALONE $(DEFS) -DDEBUG
-+#CFLAGS=-Dsparc $(OFLAG) -DSYSLOG -DSTANDALONE $(DEFS) -DDEBUG
-+CFLAGS= $(OFLAG) -DSTANDALONE -DSYSLOG $(DEFS)
- 
- #for solaris
- #CFLAGS=-Dsolaris -Dsparc $(OFLAG) -DSYSLOG -DSTANDALONE $(DEFS)
- #DFLAGS =-lsocket -lnsl -R/usr/ucblib -L/usr/ucblib -lucb
- 
--all: dserver
-+all: dserver compress/makedic
- dserver: $(OBJ)
- 	$(CC) $(CFLAGS) -o dserver $(OBJ)
- 
-+compress/makedic:
-+	(cd compress ; ${MAKE} all)
-+
- #dserver: $(OBJ)
- #	$(CC) $(CFLAGS) -o dserver $(OBJ) $(DFLAGS)
- 
-@@ -39,4 +45,12 @@
- 	lint -Dsparc -DSTANDALONE -DSYSLOG $(DEFS) *.c
- 
- install:
--	install -m 755 dserver $(BINDIR)
-+	if  [ ! -d ${DOCDIR} ] ; then mkdir -p ${DOCDIR} ; fi
-+	if  [ ! -d ${DICTROOT}/cdrom ] ; then mkdir -p ${DICTROOT}/cdrom ; fi
-+	install -c -s -m 755 dserver $(BINDIR)
-+	(cd compress ; ${MAKE} install)
-+	cp table/*.tbl table/dserver_access ${DSERVERTOPDIR}
-+	cat table/dserver_access | sed -e 's!PREFIX_DIR!${PREFIX}!g'  > ${DSERVERTOPDIR}/dserver_access
-+	cp CHANGES newfeature.doc ${DOCDIR}
-+	cp README ${DOCDIR}/README.dserver
-+	cp table/README ${DOCDIR}/README.table
---- server2.2-pl2/subnet.c.orig	Sat Aug 10 02:10:30 1996
-+++ server2.2-pl2/subnet.c	Tue Jan 28 08:22:43 1997
-@@ -1,6 +1,7 @@
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
-+#include <sys/time.h>
- #include <net/if.h>
- #include <sys/ioctl.h>
- 
---- server2.2-pl2/table/dserver_access.orig	Sat Jan 31 09:53:59 1998
-+++ server2.2-pl2/table/dserver_access	Sat Jan 31 09:53:20 1998
-@@ -1,14 +1,22 @@
--#DICT kojien /usr/local/etc/CDdict/yrrs096/koujien/start. "広辞苑第４版" 1  600
--##DICT eiwa /usr/local/etc/CDdict/yrrs118/chujiten/start. "研究社中英和" 25 600
--##DICT eiwa /usr/local/etc/CDdict/yrrs118/chujiten/start.comp "研究社中英和" 25 600
--##DICT eiwa /usr/local/etc/CDdict/yrrs009/eiwa/start.comp "研究社中英和" 25 600
--##DICT waei /usr/local/etc/CDdict/yrrs118/chujiten/start.comp "研究社中和英" 25 600
--#DICT waei /usr/local/etc/CDdict/cdchujiten/chujiten/data/honmon. "研究社中和英" 25 600
--#DICT eiwa /usr/local/etc/CDdict/cdchujiten/chujiten/data/honmon. "研究社中和英" 25 600
--#DICT CDkojien /usr/local/etc/CDdict/cdkouji/koujien/data/honmon. "広辞苑ＣＤ版" 1  600
--#DICT readers /usr/local/etc/CDdict/yrrs172/readers/start. "リーダーズ英和" 1  600
--#DICTROOT /usr/local/etc/CDdict 2 500
-+#DICT kojien PREFIX_DIR/share/dict/cdrom/yrrs096/koujien/start "広辞苑第４版" 1  600
-+##DICT kojien-furoku PREFIX_DIR/share/dict/cdrom/yrrs096/furoku/start "広辞苑第４版付録" 1  600
-+##DICT waei PREFIX_DIR/share/dict/cdrom/cdchujiten/chujiten/data/honmon "研究社中和英" 25 600
-+##DICT eiwa PREFIX_DIR/share/dict/cdrom/cdchujiten/chujiten/data/honmon "研究社中和英" 25 600
-+##DICT readers PREFIX_DIR/share/dict/cdrom/yrrs172/readers/start "リーダーズ英和" 1  600
-+##DICT crfre PREFIX_DIR/share/dict/cdrom/yrrs091/crfre/start "三省堂クラウン仏和" 1  600
-+##DICT crger PREFIX_DIR/share/dict/cdrom/yrrs092/crger/start "三省堂クラウン独和" 1  600
-+##DICT italian /usr/local/share/dict/cdrom/yrrs214/jiten/start "現代イタリア語表現辞典" 1  600
-+##DICT italian-j /usr/local/share/dict/cdrom/yrrs214/jiten/start "現代イタリア語表現辞典" 1  600
-+##DICT oxford /usr/local/share/dict/cdrom/san042/oxford/start "OxfordEnglishDictionary" 1  600
-+##DICT CDkojien PREFIX_DIR/share/dict/cdrom/cdkouji/koujien/data/honmon "広辞苑ＣＤ版" 1  600
-+##DICT eiwa PREFIX_DIR/share/dict/cdrom/yrrs118/chujiten/start "研究社中英和" 25 600
-+##DICT waei PREFIX_DIR/share/dict/cdrom/yrrs118/chujiten/start "研究社中英和" 25 600
-+##DICT eiwa PREFIX_DIR/share/dict/cdrom/yrrs118/chujiten/start.comp "研究社中英和" 25 600
-+##DICT waei PREFIX_DIR/share/dict/cdrom/yrrs118/chujiten/start.comp "研究社中和英" 25 600
-+##DICT daijirin PREFIX_DIR/share/dict/cdrom/yrrs082/dgx01/start "大辞林" 1 600
-+#
-+#DICTROOT PREFIX_DIR/share/dict/cdrom 2 500
- ## access controle
- #
--topics
-+localhost
- #
---- server2.2-pl2/compress/Makefile.orig	Sat Aug 10 02:10:29 1996
-+++ server2.2-pl2/compress/Makefile	Tue Jan 28 08:22:43 1997
-@@ -11,11 +11,15 @@
- CFLAGS = -O -Wall
- LFLAGS =
- 
-+
- OBJ1 = main.o compress.o
- 
- 
- OBJS = $(OBJ1)
- PROG = makedic
-+BINDIR = ${PREFIX}/bin
-+
-+all: $(PROG)
- 
- $(PROG)		:	$(OBJS)
- 	$(CC) $(OBJS) $(LFLAGS) -o $(PROG)
-@@ -26,5 +30,8 @@
- main.o : defs.h
- comp.o : defs.h
- 
-+install: $(PROG)
-+	install -s $(PROG) $(BINDIR)
-+
- clean:
--	rm -f *.o core makedic *~
-+	rm -f *.o core makedic *~
---- server2.2-pl2/misc.h.orig	Sun Dec  5 21:43:26 2004
-+++ server2.2-pl2/misc.h	Sun Dec  5 21:44:19 2004
-@@ -1,4 +1,5 @@
- /* external variable controle */
-+#include<sys/types.h>
- 
- #ifdef DSERVER_MAIN
- #define Extern 
---- server2.2-pl2/compress/main.c.orig	Sat Aug 10 02:10:30 1996
-+++ server2.2-pl2/compress/main.c	Sun Dec  5 21:48:36 2004
-@@ -3,6 +3,21 @@
- 					by toshioji@darkover.iijnet.or.jp
- 
- 	dic version 0.24 cdio.c by kmiya さんを元に作成
-+
-+========== dic.man より引用開始 ==========
-+DIC(1)                   Dic Users Manual                  DIC(1)
-+
-+
-+DISTRIBUTION
-+       このプログラムの改良 移植 転載 などは、 自由に行っても らっ
-+       て結構です。 また、 作者に報告する必要もありません。
-+
-+       で き れば、改変された物であることの明記（どのバ−ジョンの
-+       Dic をどのように変更したか）をしていただければ幸いです。
-+
-+       さらにソ−スコ−ドも同時に公開していただいてさらなる改良 が
-+       自由に 行われるようにすることを希望します。
-+========== dic.man より引用終了 ==========
-  */
- 
- #include    "defs.h"
-@@ -36,10 +51,47 @@
-   return 0;
- }
- 
-+char ok(char *string)
-+{
-+  char key_buf[2];
-+
-+  fputs( string, stdout );
-+  fgets( key_buf, 2, stdin );
-+  return key_buf[0];
-+}
-+
-+void caution(void)
-+{
-+
-+  puts("<<<<<<<<< makedic を使われる前に※必ず※以下の内容を確認下さい。>>>>>>>>>\nこれは dserver/server2.1/README「執筆   臼井 義比古＠環境システム研究所」\nからライセンス関係の記述を抜きだしたものです。\n==================== dserver/server2.1/README ====================\n  ライセンスはちゃんと守って下さい,以下に三田吉郎<mita@jp.FreeBSD.org>\n  さんが調べて下さった文章を添付します.\n------------------------------------------------------------------------" );
-+  ok( "<改行キーを押して下さい>" );
-+
-+  puts("ライセンスについて   三田吉郎 <mita@jp.FreeBSD.org>\n dserverは、8cmCDROM版研究社新英和・和英中辞典、岩波書店広辞苑を\n 始めとする、電子ブックを読むことが出来ます。使用のたびにCDROMを\nマウントすればよいのですが、例えばCDROM分離型のノートパソコンで\n辞書を使いたいなど、ハードディスクにデータをコピーして使いたいと\n思うかも知れません。市販の\n辞書をハードディスクにコピーすること、または圧縮された辞書としての使用\nに関して問題があるかどうか、研究社と岩波書店とにお伺いしてみました(平成8年6月20日)。\n");
-+  ok( "<改行キーを押して下さい>" );
-+  puts("研究社の回答(電話03-3288-7777)\n個人として使用するかぎりにおいては、ハードディスクへのコピー、また\nそのデータが圧縮されてたとしても使用して良い。ただし、LAN上で\n複数の端末で使用する場合は、別途端末の台数を申告していただき、\n端末台数×(CDROM一枚の価格−α)の値段を払う契約をしていただく。");
-+  ok( "<改行キーを押して下さい>" );
-+  puts("岩波書店辞典部の回答  (電話03-5210-4171)\nCD-ROMドライブから読み出して使用することを前提としている。\n ハードディスクへのコピーは避けていただきたい。\n LAN上での使用の場合は、別途契約をしていただき、\n ハードディスクへのコピーを許可している。ただしUNIX上の\n サーバソフトに関しては把握していない。");
-+  ok( "<改行キーを押して下さい>" );
-+  puts("dserverは、この他にもOEDや、科学技術用語辞典など、外字テーブルさえ\n 用意すればほとんどのCDROMを読むことが出来ます。そのとき自分のローカル\n ディスクにデータをコピーして使用して良いかは、各社対応が異なります。\n 新しい辞書を使用する場合はまずライセンスを確認した後に使用することを\n お勧めします。\nということですので、例えば新英和・和英中辞典に関しては個人のマシンの\nハードディスクにコピーすることは可能ですが、広辞苑に関してはLAN契約を\n結ばない限りハードディスクへのコピーをさけるのが良いようです。\n");
-+  puts("-----------------------------------------------------------------------\n 以上");
-+  switch( ok( "辞書を圧縮してハードディスクにコピーすることに\nライセンス上の問題はありませんね[y/n] " ) ) {
-+  case 'y':
-+  case 'Y':
-+	puts( "\n圧縮を開始します。\n" );
-+	break;
-+  default:
-+	puts( "\nライセンス上の問題があるので中断しました\n" );
-+	exit( -1 );
-+	break;	
-+  }
-+}
-+
- int	main(int argc, char *argv[])
- {
-+  caution();
-+
-   if( argc < 3 ) {
--    fprintf( stderr, "%s soce_filename dest_filename\n", argv[ 0 ] );
-+    fprintf( stderr, "Usage: %s soce_filename dest_filename\n", argv[ 0 ] );
-     exit( -1 );
-   }
- 
diff --git a/japanese/dserver/files/patch-ac b/japanese/dserver/files/patch-ac
deleted file mode 100644
index 3254b068053a..000000000000
--- a/japanese/dserver/files/patch-ac
+++ /dev/null
@@ -1,166 +0,0 @@
-patch files for kenjiro
---- clients/kenjiro/sub.c.orig	Sun Dec  5 20:23:03 2004
-+++ clients/kenjiro/sub.c	Sun Dec  5 21:50:51 2004
-@@ -1,6 +1,11 @@
- #include "kenjiro.h"
- 
- static int sttylevel = 0;
-+#ifdef TERMIOS
-+#include <termios.h>
-+#include <unistd.h>
-+static struct termios ttyorg, ttynew;
-+#else /* TERMIOS */
- #ifdef TERMIO
- #include <termio.h>
- #include <bsdtty.h>
-@@ -10,6 +15,7 @@
- static struct tchars tcorg, tcnew;
- #endif
- static struct ltchars ltcorg, ltcnew;
-+#endif /* TERMIOS */
- int numk;
- int mode;
- int fd1 = 0;
-@@ -39,6 +45,26 @@
- 	ttynew.c_cc[VQUIT] = 0;
- 	if (ioctl(0, TCSETA, &ttynew) < 0) return;
- #else
-+# ifdef TERMIOS
-+	if (tcgetattr(0, &ttyorg) < 0) return;
-+	ttynew = ttyorg;
-+	ttynew.c_lflag &= ~ECHO;
-+	ttynew.c_lflag &= ~ICANON;
-+	ttynew.c_cc[VMIN] = 1;
-+	ttynew.c_cc[VTIME] = 0;
-+	ttynew.c_cc[VQUIT] = 0;
-+	ttynew.c_cc[VLNEXT] = _POSIX_VDISABLE;
-+#if   defined(VDSUSP)
-+	ttynew.c_cc[VDSUSP] = _POSIX_VDISABLE;
-+#else /* VDSUSP */
-+# if defined(VEOL)
-+	ttynew.c_cc[VEOL] = _POSIX_VDISABLE;
-+# endif /* VEOL */
-+#endif /* VDSUSP */
-+	sttylevel++;
-+	if (tcsetattr(0, TCSANOW, &ttynew) < 0) return;
-+	sttylevel++;
-+# else /* TERMIOS */
- 	if (ioctl(0, TIOCGETP, &ttyorg) < 0) return;
- 	ttynew = ttyorg;
- 	ttynew.sg_flags |= CBREAK;
-@@ -49,7 +75,9 @@
- 	tcnew = tcorg;
- 	tcnew.t_quitc = -1;
- 	if (ioctl(0, TIOCSETC, &tcnew) < 0) return;
-+# endif /* TERMIOS */
- #endif
-+#ifndef TERMIOS
- 	sttylevel++;
- 	if (ioctl(0, TIOCGLTC, &ltcorg) < 0) return;
- 	ltcnew = ltcorg;
-@@ -57,6 +85,7 @@
- 	ltcnew.t_dsuspc = -1;
- 	if (ioctl(0, TIOCSLTC, &ltcnew) < 0) return;
- 	sttylevel++;
-+#endif /* TERMIOS */
- }
- 
- void romakana_fixtty()
-@@ -68,12 +97,18 @@
- 	case 1:
- 		ioctl(0, TCSETA, &ttyorg);
- #else
-+# ifdef TERMIOS
-+	case 2:
-+	case 1:
-+		tcsetattr(0, TCSANOW, &ttyorg);
-+# else /* TERMIOS */
- 	case 3:
- 		ioctl(0, TIOCSLTC, &ltcorg);
- 	case 2:
- 		ioctl(0, TIOCSETC, &tcorg);
- 	case 1:
- 		ioctl(0, TIOCSETP, &ttyorg);
-+# endif /* TERMIOS */
- #endif
- 	}
- }
-@@ -111,17 +146,17 @@
- 
- 	if ((fd1 = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0){
- 		fprintf(stderr, "Can not create socket\n");
--		exit();
-+		exit(1);
- 	}
- 	addr.sin_family = AF_INET;
- 	if ((host = gethostbyname(server)) == NULL){
- 		fprintf(stderr,"Can not get address %s\n", server);
--		exit();
-+		exit(1);
- 	}
- #ifdef SERVICE
- 	if ((sp = getservbyname(service, "tcp")) == NULL){
- 		fprintf(stderr, "%s is not found in /etc/services\n", service);
--		exit();
-+		exit(1);
- 	}
- 	addr.sin_port = sp->s_port;
- #else
-@@ -130,13 +165,13 @@
- 	bcopy(host->h_addr, &addr.sin_addr, host->h_length);
- 	if (connect(fd1,&addr,sizeof(addr)) < 0) {
- 		fprintf(stderr,"Can not connect\n");
--		exit();
-+		exit(1);
- 	}
- }
- 
- void getttyval()
- {
--#ifdef TERMIO
-+#if defined(TERMIO) || defined(TERMIOS)
- 	struct winsize ws;
- 
- 	ioctl(0, TIOCGWINSZ, &ws);
---- clients/kenjiro/Makefile.orig	Tue Jun 27 01:21:31 1995
-+++ clients/kenjiro/Makefile	Tue Jan 28 15:39:36 1997
-@@ -1,5 +1,6 @@
--CFLAGS = -O		# for termcap
-+#CFLAGS = -O		# for termcap
- #CFLAGS = -O -DTERMIO	# for termio
-+CFLAGS = -O -DTERMIOS	# for termios
- 
- # if you have no bcopy sigmask sigblock (e.g. on Solaris 2.x)
- # define NO_BCOPY NO_SIGMASK NO_SIGBLOCK like
-@@ -15,6 +16,11 @@
- 
- all:	kenjiro kenjiro.l
- 
-+install: all
-+	gzip -9Nf kenjiro.l
-+	install -s kenjiro ${PREFIX}/bin/
-+	install kenjiro.l.gz ${PREFIX}/man/manl/
-+
- kenjiro: $(OBJS)
- 	$(CC) $(CFLAGS) -o kenjiro $(OBJS) $(LIBS)
- 
-@@ -30,6 +36,6 @@
- 		ln -s filter.c.euc filter.c
- 
- clean:
--	rm -f *.o *.out kenjiro.l kenjiro core typescript
-+	rm -f *.o *.out kenjiro.l* kenjiro core typescript
- 
- # DO NOT DELETE
---- clients/kenjiro/config.h.orig	Wed Jul 22 08:53:06 1998
-+++ clients/kenjiro/config.h	Wed Jul 22 08:53:22 1998
-@@ -1,7 +1,7 @@
--#define PAGER		"/usr/local/bin/less"	/* pager program */
-+#define PAGER		"/usr/local/bin/jless"	/* pager program */
- #define HISTSIZE	20		/* history size */
- #define	KOUHO		10		/* number of kouho  (0 < n <= 10) */
--#define SERVER		"dserver"	/* hostname with server */
-+#define SERVER		"localhost"	/* hostname with server */
- #define SERVICE		"ndtp"		/* service name */
- #define KANJICODE	JIS		/* default kanji code (JIS,EUC,SJIS)*/
- /*#define PORT		2010*/		/* port of service */
diff --git a/japanese/dserver/files/patch-ad b/japanese/dserver/files/patch-ad
deleted file mode 100644
index 7b9aa0bed9cd..000000000000
--- a/japanese/dserver/files/patch-ad
+++ /dev/null
@@ -1,15 +0,0 @@
-*** server2.2-pl2/compress/defs.h.orig	Thu May  1 13:03:28 1997
---- server2.2-pl2/compress/defs.h	Thu May  1 13:04:28 1997
-***************
-*** 24,31 ****
---- 24,33 ----
-  
-  typedef	unsigned char	uchar;
-  #ifndef LINUX
-+ #ifndef __FreeBSD__
-  typedef	unsigned short	ushort;
-  typedef	unsigned int	uint;
-+ #endif /*__FreeBSD__*/
-  typedef	unsigned long	ulong;
-  #endif /* LINUX */
-  
diff --git a/japanese/dserver/files/setup.sh.inetd b/japanese/dserver/files/setup.sh.inetd
deleted file mode 100644
index 6b0b6a6853e8..000000000000
--- a/japanese/dserver/files/setup.sh.inetd
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/sh
-echo "You have to do 5 things before using dserver via inetd."
-echo "1. Add 'ndtp	2010/tcp' to /etc/services."
-echo "2. Add 'ndtp stream tcp nowait root /usr/local/lib/dserver dserver'"
-echo "          to /etc/inetd.conf"
-echo "3. Add startup configration of mule-client to site-start.el."
-echo "4. Restart inetd by 'kill -HUP `cat /var/run/inetd.pid`'."
-echo "5. Mount cdrom (or copy files) to PREFIX_DIR/share/dict/cdrom/."
-
-# Hack /etc/services
-echo
-echo "Updating /etc/services"; 
-cp /etc/services /etc/services.bak; 
-(grep -v ndtp /etc/services.bak ; echo "ndtp	2010/tcp	# Network Dictionary Transfer Protocol") > /tmp/services
-echo "Do you like to update /etc/services automatically? (y/n) [y]" ;
-read ans;
-case x${ans} in
-	xn*|xN*)
-	echo "Do you like to change /etc/services file by yourself? (y/n) [y]" ;
-	read choice ;
-	case x${choice} in 
-		xn*|xN*)
-		echo "Okay, do nothing.";;
-		*)
-		echo "Edit /etc/services file by yourself (Press Return)";
-		read dummy; 
-		vi -c /ndtp /tmp/services;
-		cp /tmp/services /etc/services; rm /tmp/services ;;
-	esac ;;
-	*) 
-	echo "original file is saved in /etc/services.bak" ;
-	cp /tmp/services /etc/services; rm /tmp/services ;;
-esac
-
-# Hack /etc/inetd.conf
-echo
-echo "Updating /etc/inetd.conf"; 
-cp /etc/inetd.conf /etc/inetd.conf.bak; 
-(grep -v ndtp /etc/inetd.conf.bak ; echo "ndtp	stream	tcp	nowait	root	/usr/local/lib/dserver/dserver	dserver") > /tmp/inetd.conf
-echo "Do you like to update /etc/inetd.conf automatically? (y/n) [y]" ;
-read ans;
-case x${ans} in
-	xn*|xN*)
-	echo "Do you like to change /etc/inetd.conf file by yourself? (y/n) [y]" ;
-	read choice ;
-	case x${choice} in 
-		xn*|xN*)
-		echo "Okay, do nothing.";;
-		*)
-		echo "Edit /etc/inetd.conf file by yourself (Press Return)";
-		read dummy; 
-		vi -c /ndtp /tmp/inetd.conf;
-		cp /tmp/inetd.conf /etc/inetd.conf; rm /tmp/inetd.conf ;;
-	esac ;;
-	*) 
-	echo "original file is saved in /etc/inetd.conf.bak" ;
-	cp /tmp/inetd.conf /etc/inetd.conf; rm /tmp/inetd.conf ;;
-esac
-
-echo "Do you want to restart inetd right now? (y/n) [y]" ;
-read ans;
-case x${ans} in
-	xn*|xN*)
-	echo "Remember to restart inetd (or reboot)."
-	;;
-	*)
-	echo "Restart inetd."
-	kill -HUP `cat /var/run/inetd.pid`
-	;;
-esac
-
-echo "Now startup configuration is done."
-echo "Remember to mount cdrom to PREFIX_DIR/share/dict/cdrom."
diff --git a/japanese/dserver/files/setup.sh.standalone b/japanese/dserver/files/setup.sh.standalone
deleted file mode 100644
index 1b49a2b5860c..000000000000
--- a/japanese/dserver/files/setup.sh.standalone
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/bin/sh
-echo "You have to do 4 things before using dserver."
-echo "1. Add 'ndtp	2010/tcp' to /etc/services."
-echo "2. Add startup command of dserver to PREFIX_DIR/etc/rc.d/"
-echo "3. Add startup configration of mule-client to site-start.el."
-echo "4. Mount cdrom (or copy files) to PREFIX_DIR/share/dict/cdrom/."
-
-# Hack /etc/services
-echo
-echo "Updating /etc/services"; 
-cp /etc/services /etc/services.bak; 
-(grep -v ndtp /etc/services.bak ; echo "ndtp	2010/tcp	# Network Dictionary Transfer Protocol") > /tmp/services
-echo "Do you like to update /etc/services automatically? (y/n) [y]" ;
-read ans;
-case x${ans} in
-	xn*|xN*)
-	echo "Do you like to change /etc/services file by yourself? (y/n) [y]" ;
-	read choice ;
-	case x${choice} in 
-		xn*|xN*)
-		echo "Okay, do nothing.";;
-		*)
-		echo "Edit /etc/services file by yourself (Press Return)";
-		read dummy; 
-		vi -c /ndtp /tmp/services;
-		cp /tmp/services /etc/services; rm /tmp/services ;;
-	esac ;;
-	*) 
-	echo "original file is saved in /etc/services.bak" ;
-	cp /tmp/services /etc/services; rm /tmp/services ;;
-esac
-
-# Add startup shell script to PREFIX_DIR/etc/rc.d
-echo
-echo "Adding startup shell script to PREFIX_DIR/etc/rc.d/"
-echo  "Do you like to add startup shell script automatically? (y/n) [y]" ;
-(echo "#!/bin/sh" ;
- echo "# dserver - dictionary server" ;
- echo "case \"\$1\" in" ;
- echo "start)" ;
- echo "	if [ -x PREFIX_DIR/lib/dserver/dserver ] ; then" ;
- echo "		PREFIX_DIR/lib/dserver/dserver &" ;
- echo "		echo -n ' dserver'" ;
- echo "	fi" ;
- echo "	;;" ;
- echo "stop)" ;
- echo "	;;" ;
- echo "*)" ;
- echo "	echo \"Usage: `basename $0` {start|stop}\" >&2" ;
- echo "	exit 64" ;
- echo "	;;" ;
- echo "esac" ;
- echo "" ;
- echo "exit 0") > /tmp/dserver.sh
-read ans;
-case x${ans} in
-	xn*|xN*)
-	echo "Do you like to edit PREFIX_DIR/etc/rc.d/dserver.sh file by yourself? (y/n) [y]" ;
-	read choice ;
-	case x${choice} in 
-		xn*|xN*)
-		echo "Okay, do nothing."
-		echo "rm /tmp/dserver.sh"
-		;;
-		*)
-		echo "Edit dserver.sh file by yourself (Press Return)";
-		read dummy; 
-		vi /tmp/dserver.sh;
-		cp /tmp/dserver.sh PREFIX_DIR/etc/rc.d/
-		chmod 755 PREFIX_DIR/etc/rc.d/dserver.sh
-		rm /tmp/dserver.sh
-		;;
-	esac
-	;;
-	*) 
-		cp /tmp/dserver.sh PREFIX_DIR/etc/rc.d/
-		chmod 755 PREFIX_DIR/etc/rc.d/dserver.sh
-		rm /tmp/dserver.sh
-		echo "dserver.sh is added to PREFIX_DIR/etc/rc.d/"
-esac
-
-echo "Now startup configuration is done."
-echo "Remember to mount cdrom to PREFIX_DIR/share/dict/cdrom."
diff --git a/japanese/dserver/pkg-descr b/japanese/dserver/pkg-descr
deleted file mode 100644
index 0d8994a6a729..000000000000
--- a/japanese/dserver/pkg-descr
+++ /dev/null
@@ -1,11 +0,0 @@
-dserver is a CDROM dictionary server program.
-
-You have to install dictionary file to the directory which is
-specified in /usr/local/lib/dserver/dserver_access file.
-Refer /usr/local/lib/dserver/doc/README.FreeBSD-setup.euc (in Japanese)
-for configuration.
-
-'kenjiro', is installed for client programs. Type 'kenjiro' on command line.
-Dictionary looking up program for Mule is also available.  
-Install diclookup-mule package.
-Look at /usr/local/lib/dserver/doc/* for more information.
diff --git a/japanese/dserver/pkg-plist b/japanese/dserver/pkg-plist
deleted file mode 100644
index c93e445478cb..000000000000
--- a/japanese/dserver/pkg-plist
+++ /dev/null
@@ -1,38 +0,0 @@
-bin/makedic
-bin/kenjiro
-lib/dserver/doc/newfeature.doc
-lib/dserver/doc/CHANGES
-lib/dserver/doc/README.dserver
-lib/dserver/doc/README.table
-lib/dserver/doc/protocol2
-lib/dserver/doc/protocol
-lib/dserver/doc/DICTIONARIES
-lib/dserver/doc/ACKNOWLEDGMENT
-lib/dserver/doc/Copyright.kenjiro
-lib/dserver/doc/README.kenjiro
-lib/dserver/doc/README.FreeBSD-setup.euc
-lib/dserver/dserver
-lib/dserver/CDkojien.tbl
-lib/dserver/yrrs172.tbl
-lib/dserver/yrrs118.tbl
-lib/dserver/yrrs096.tbl
-lib/dserver/yrrs009.tbl
-lib/dserver/yrrs007.tbl
-lib/dserver/waei.tbl
-lib/dserver/readers.tbl
-lib/dserver/oxford.tbl
-lib/dserver/kojien3.tbl
-lib/dserver/kojien.tbl
-lib/dserver/eiwa.tbl
-lib/dserver/crger.tbl
-lib/dserver/crfre.tbl
-lib/dserver/chujiten.tbl
-lib/dserver/cdchuji.tbl
-lib/dserver/dserver_access
-lib/dserver/setup.sh
-lib/dserver/deinstall.sh
-man/manl/kenjiro.l.gz
-@dirrm lib/dserver/doc
-@dirrm lib/dserver
-@exec /bin/mkdir -p %D/share/dict/cdrom
-@dirrm share/dict/cdrom
diff --git a/japanese/dserver/pkg-req b/japanese/dserver/pkg-req
deleted file mode 100644
index efec38f26d7f..000000000000
--- a/japanese/dserver/pkg-req
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-if [ "$2" != "INSTALL" ] 
-	then exit
-fi
-echo "Consider ${PKG_PREFIX}/lib/dserver/setup.sh for startup configuration."
-echo "Documents are put in ${PKG_PREFIX}/lib/dserver/doc/."
diff --git a/japanese/dserver/scripts/configure b/japanese/dserver/scripts/configure
deleted file mode 100644
index 6f73d3f98ffe..000000000000
--- a/japanese/dserver/scripts/configure
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-# dserver configuration shell script
-# usage: /bin/sh configure 
-
-if [ X"${BATCH}" != X"yes" ] ; then
-/usr/bin/dialog --title "dserver port configuration" --radiolist \
-"How do you want to run  dserver, standalone or run by inetd?" -1 -1 2 \
-"standalone" "standalone" ON \
-"inetd" "inetd" OFF 2>/tmp/dserver.ports.selection
-
-if [ X`cat /tmp/dserver.ports.selection` = "Xinetd" ]
-	then
-	 echo 'Inetd mode is selected'
-	 cp ${FILESDIR}/setup.sh.inetd		${WRKSRC}/setup.sh.template
-	 cp ${FILESDIR}/deinstall.sh.inetd	${WRKSRC}/deinstall.sh.template
-	 cp ${WRKSRC}/server2.2-pl2/Makefile	${WRKSRC}/server2.2-pl2/Makefile.tmp
-	 cat ${WRKSRC}/server2.2-pl2/Makefile.tmp | sed -e "s/-DSTANDALONE//g" \
-		> ${WRKSRC}/server2.2-pl2/Makefile
-else
-	 echo 'Standalone mode is selected'
-	 cp ${FILESDIR}/setup.sh.standalone	${WRKSRC}/setup.sh.template
-	 cp ${FILESDIR}/deinstall.sh.standalone	${WRKSRC}/deinstall.sh.template
-	 
-fi
-
-rm -f /tmp/dserver.ports.selection
-
-else
-
- echo 'Standalone mode (default) is selected'
- cp ${FILESDIR}/setup.sh.standalone	${WRKSRC}/setup.sh.template
- cp ${FILESDIR}/deinstall.sh.standalone	${WRKSRC}/deinstall.sh.template
-
-fi
diff --git a/japanese/ebw3/Makefile b/japanese/ebw3/Makefile
deleted file mode 100644
index 14eefdd27b34..000000000000
--- a/japanese/ebw3/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-# New ports collection makefile for:    ebw3
-# Date created:         23 Jun 1997
-# Whom:                 Hironori Ikura <hikura@kaisei.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	ebw3
-PORTVERSION=	${VERSION:S/-//}
-CATEGORIES=	japanese
-MASTER_SITES=	# disappeared
-DISTNAME=	${PORTNAME}-${VERSION}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Access to Japanese EPWING or Electric-Book based CD-ROM via HTTP
-
-DEPRECATED=		mastersite disappeared, no longer maintained by author
-EXPIRATION_DATE=	2005-10-11
-
-VERSION=	0.2-b4
-
-STARTUP_SCRIPT=	$(PREFIX)/etc/rc.d/ebw3d.sh.sample
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=		"Does not compile on FreeBSD ${OSVERSION}"
-.endif
-
-post-install:
-	${MKDIR} ${PREFIX}/www/cgi-bin
-	${INSTALL} -c -o nobody -g nobody -m 555 ${WRKSRC}/cdsearch \
-						$(PREFIX)/www/cgi-bin
-	${INSTALL_DATA} ${WRKSRC}/ebw3d.conf $(PREFIX)/etc/ebw3d.conf.sample
-.if !defined(NOPORTDOCS)
-	${MKDIR} $(PREFIX)/share/doc/ebw3
-	${INSTALL_DATA} ${WRKSRC}/INSTALL $(PREFIX)/share/doc/ebw3
-	${INSTALL_DATA} ${WRKSRC}/README $(PREFIX)/share/doc/ebw3
-	${INSTALL_DATA} ${FILESDIR}/README.port $(PREFIX)/share/doc/ebw3
-	${INSTALL_DATA} ${FILESDIR}/README.access $(PREFIX)/share/doc/ebw3
-.endif
-	${INSTALL_SCRIPT} ${FILESDIR}/ebw3d.sh.sample $(PREFIX)/etc/rc.d
-
-.include <bsd.port.post.mk>
diff --git a/japanese/ebw3/distinfo b/japanese/ebw3/distinfo
deleted file mode 100644
index a94fb4a0be48..000000000000
--- a/japanese/ebw3/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (ebw3-0.2-b4.tar.gz) = 60cc84edfe0bee1beb0d23839cc29e1b
-SIZE (ebw3-0.2-b4.tar.gz) = 55462
diff --git a/japanese/ebw3/files/README.access b/japanese/ebw3/files/README.access
deleted file mode 100644
index 562d53daebc4..000000000000
--- a/japanese/ebw3/files/README.access
+++ /dev/null
@@ -1,62 +0,0 @@
-
-         ebw3-0.2-b4 のアクセス制限についてのメモ
-
-
-  以下の例は、広島大学の田岡様よりいただいた、サンプルです。
-利用については、あくまで AT YOUR OWN RISK でお願いいたします。
-
-                                                 Hironori Ikura / 伊倉 広徳
-                                                     <hikura@kaisei.org>
-
-==============================================================================
-ebw3は，ホストのアクセス制限がありません．ebw3-0.2-b4/README中の
-
-制限事項
-
-  ・アクセスを制限する機能は持っていません。アクセス制限はhttpdで行なってくだ
-    さい。
-
-とありますが，これに対する簡単な対策として，私のところでは次のように
-cdsearchを書き換えています．（ただし，これはライセンス数の制限ではありま
-せん．）
-
-
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-YOURDOMAIN='my.domain'
-
-SERVERS='myname.my.domain'
-URL='http://myname.my.domain/cgi-bin/cdsearch'
-export SERVERS URL
-
-REMOTE_DOMAIN=`echo $REMOTE_HOST | sed 's/[a-zA-Z0-9]*.\([a-zA-Z0-0]*\)/\1/'`
-if [ "$REMOTE_DOMAIN" = "$YOURDOMAIN" ]; then          
-/usr/local/libexec/ebw3
-else
-echo "Content-type: text/html"
-echo ""
-echo "<HTML><HEAD>"
-echo "<TITLE>Your host can not be access to this page.</TITLE>"
-echo "</HEAD><BODY>"
-echo "<PRE>"
-echo "Your host ($REMOTE_HOST) can not be access to this page."
-echo "</PER>"
-echo "</BODY></HTML>" 
-fi
-
-（このスクリプトを使う場合には変数YOURDOMAIN, SERVERS, URLの値は適宜変更
-してください．）
-
-変数$REMOTE_HOSTにアクセスしてきたマシンの「ホスト名+ドメイン名」が入る
-ことを利用して，ドメイン「my.domain」に所属しているマシンからのアクセス
-みのに対して検索の許可を与えています．ただし，この変数$REMOTE_HOSTはどの
-httpdでも利用可能かは知りませんが．私の使っているhttpd
-
-# /usr/local/libexec/httpd  -version     
-CERN World-Wide Web Daemon 3.0, libwww 2.17
-
-では利用できました．
-==============================================================================
diff --git a/japanese/ebw3/files/README.port b/japanese/ebw3/files/README.port
deleted file mode 100644
index 131d60221148..000000000000
--- a/japanese/ebw3/files/README.port
+++ /dev/null
@@ -1,88 +0,0 @@
-
-         ebw3-0.2-b4 in FreeBSD port についてのメモ
-
-
-
-まずはじめに、オリジナルの README と INSTALL をよく読んでください。
-(/usr/local/share/doc/ebw3にインストールされています。)
-
-(注) 以下、PREFIX が /usr/local でインストールされたものと仮定します。
-
-* オリジナルからの変更点
-
-  インストールするディレクトリを分割しました。
-    バイナリ(ebw3d, ebw3, ebdp)        -> /usr/local/libexec
-    コンフィギュレーション(ebw3d.conf) -> /usr/local/etc
-    CGIスクリプト(cdsearch)            -> /usr/local/www/cgi-bin
-
-  また、以下のファイルが追加インストールされてます。
-    サンプル rc (ebw3d.sh.sample)      -> /usr/local/etc/rc.d
-
-
-* 使用にあたっての注意
-
-  本来は、HTTPサーバー上には cdsearch と ebw3 が、
-  また辞書をマウントしてあるマシン上では ebw3d と、ebw3d.conf が
-  あれば動作するはずですが、この port では、どちらも
-  同時にインストールされるようになってます。
-
-  この二つを一つのマシンでまかなうことが多いと思われますので、
-  cdsearch の辞書サーバーには 'localhost' をデフォルトで定義しましたが、
-  適宜、これを修正して利用してください。
-
-
-* HTTPサーバー上での設定
-
-  上述の cdsearch の中の、'SERVERS=' 以下を適宜設定してください。
-  (複数の辞書サーバーが指定できます。)
-
-
-* 辞書サーバー上での設定
-
-  ebw3d.conf を CD-ROM のマウントポイントに合わせて編集して、
-  ebw3d を実行してテストしてください。
-
-  ebw3d.sh.sample  を ebw3d.sh に mv しておくと、
-  リブート時に自動的に ebw3d が立ち上がります。
-
-  チェンジャータイプの CD-ROM ドライブを使って複数の辞書をマウントし
-  ている場合、ebw3d 起動時に内容へのアクセスが不安定なことがあるようです。
-  この場合は、CD-ROM自体のトップディレクトリ(マウントポイント直下)に
-  前もって(lsなどで)アクセスしておくと、上手くいくようです。
-
-
-* この port で動作確認している CD-ROM
-
-  ・広辞苑 第四版 CD-ROM版 (EP-WING)                            SCTS-3022
-  ・広辞苑 第四版 CD-ROM(カラー)版 (EP-WING)                    OCTS-3023
-  ・研究社 新英和・和英中辞典 CD-ROM版 (EP-WING)                6D19-14
-
-基本的な動作は確認しましたが、全ての検索方法にわたって
-チェックしたわけではありません。
-
-なお、ブラウザは Netscape Navigator 3.01 Gold (on FreeBSD 2.2.1)
-でテストしました。
-
-
-* アクセス制限についての考察
-
-  ebw3 では、READMEにもあるようにアクセスを制限する機能を準備していません。
-  これについて、広島大学の田岡様からいただきましたサンプルを、README.access
-  というファイルに収めていますのでご覧ください。
-
-
-* お礼
-
- この port の作成にあたって、広島大学の田岡様から、上述のアクセス制限方法の
- ほかにも多くのご意見、ご指摘をいただきました。どうもありがとうございました。
-
-
-* バグレポート / コメント
-
-  この port は作者の塩田さんの許可のもとに作成されてますが、
-  特に FreeBSD-port に特有の問題と思われるものは、
-  下記のアドレスにお知らせください。
-
-
-                                                 Hironori Ikura / 伊倉 広徳
-                                                     <hikura@kaisei.org>
diff --git a/japanese/ebw3/files/ebw3d.sh.sample b/japanese/ebw3/files/ebw3d.sh.sample
deleted file mode 100644
index d7168858ca91..000000000000
--- a/japanese/ebw3/files/ebw3d.sh.sample
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-case "$1" in
-start)
-	if [ -f /usr/local/libexec/ebw3d \
-	     -a -f /usr/local/etc/ebw3d.conf ]; then
-		/usr/local/libexec/ebw3d > /var/log/ebw3d.log 2>&1 &
-		echo -n ' ebw3d'
-	fi
-	;;
-stop)
-	killall ebw3d && echo -n ' ebw3d'
-	;;
-*)
-	echo "Usage: `basename $0` {start|stop}" >&2
-	exit 64
-	;;
-esac
diff --git a/japanese/ebw3/files/patch-aa b/japanese/ebw3/files/patch-aa
deleted file mode 100644
index b76240934c87..000000000000
--- a/japanese/ebw3/files/patch-aa
+++ /dev/null
@@ -1,48 +0,0 @@
-*** Makefile.orig	Sat May 24 01:09:16 1997
---- Makefile	Mon Jun 23 16:54:38 1997
-***************
-*** 1,13 ****
-  #
-  # $Id: Makefile,v 1.4 1996/04/22 01:19:40 root Exp $
-  #
-! DESTDIR	= /usr/local/etc
-  PROGS	= ebw3 ebw3d ebdp
-  SRCS	= main.c init.c func.c search.c html1.c html2.c image.c gif.c gif2.c\
-  	  kanji.c romatbl.c util.c
-  OBJS	= main.o init.o func.o search.o html1.o html2.o image.o gif.o gif2.o\
-  	  kanji.o romatbl.o util.o
-! CFLAGS	= -g -O # -DDEBUG
-  CC	= gcc
-  
-  all	: $(PROGS)
---- 1,13 ----
-  #
-  # $Id: Makefile,v 1.4 1996/04/22 01:19:40 root Exp $
-  #
-! DESTDIR	= ${PREFIX}/libexec
-  PROGS	= ebw3 ebw3d ebdp
-  SRCS	= main.c init.c func.c search.c html1.c html2.c image.c gif.c gif2.c\
-  	  kanji.c romatbl.c util.c
-  OBJS	= main.o init.o func.o search.o html1.o html2.o image.o gif.o gif2.o\
-  	  kanji.o romatbl.o util.o
-! CFLAGS	= -g -O -DCONFIG_FILE=\"${PREFIX}/etc/ebw3d.conf\"
-  CC	= gcc
-  
-  all	: $(PROGS)
-***************
-*** 22,28 ****
-  	$(CC) $(CFLAGS) -o $@ ebdp.o
-  
-  install	:
-! 	install	-c -s $(PROGS) $(DESTDIR)
-  
-  clean	:
-  	-rm -f $(OBJS) $(PROGS) *.core core ebw3.o ebdp.o version.o
---- 22,28 ----
-  	$(CC) $(CFLAGS) -o $@ ebdp.o
-  
-  install	:
-! 	install	-c -s -o bin -g bin -m 555 $(PROGS) $(DESTDIR)
-  
-  clean	:
-  	-rm -f $(OBJS) $(PROGS) *.core core ebw3.o ebdp.o version.o
diff --git a/japanese/ebw3/files/patch-ab b/japanese/ebw3/files/patch-ab
deleted file mode 100644
index ea385f8526f8..000000000000
--- a/japanese/ebw3/files/patch-ab
+++ /dev/null
@@ -1,21 +0,0 @@
-*** cdsearch.orig	Sat May 24 01:09:16 1997
---- cdsearch	Sun Jun  8 18:07:37 1997
-***************
-*** 3,10 ****
-  # $Id: cdsearch,v 1.2 1995/05/01 19:03:38 root Exp $
-  #
-  
-! SERVERS='server1.your.domain server2.your.domain server3.your.domain'
-  URL='/cgi-bin/cdsearch'
-  export SERVERS URL
-  
-! /usr/local/etc/ebw3
---- 3,10 ----
-  # $Id: cdsearch,v 1.2 1995/05/01 19:03:38 root Exp $
-  #
-  
-! SERVERS='localhost'
-  URL='/cgi-bin/cdsearch'
-  export SERVERS URL
-  
-! /usr/local/libexec/ebw3
diff --git a/japanese/ebw3/pkg-descr b/japanese/ebw3/pkg-descr
deleted file mode 100644
index a08597738490..000000000000
--- a/japanese/ebw3/pkg-descr
+++ /dev/null
@@ -1,15 +0,0 @@
-Access to Japanese EPWING or Electric-Book based CD-ROM via HTTP.
-
-* It can be browsable from any GUI based Web client (NS, Mosaic ...)
-   on any Web terminal (WS, PC, Mac ...).
-
-* External-letters("GAIJI") are extracted as in-line image.
-
-* References in the dictionary are clickable.
-
-* Images and audio-data(pronunciations, etc.) access via browsers.
-
-* It supports dictionaries based upon Japanese standard ONLY.
-
-In use of this programs, you have to check the agreement of your
-CD-ROM dictionary for the network usage.
diff --git a/japanese/ebw3/pkg-plist b/japanese/ebw3/pkg-plist
deleted file mode 100644
index 5b1ff1f9cf46..000000000000
--- a/japanese/ebw3/pkg-plist
+++ /dev/null
@@ -1,12 +0,0 @@
-libexec/ebw3
-libexec/ebw3d
-libexec/ebdp
-www/cgi-bin/cdsearch
-etc/ebw3d.conf.sample
-etc/rc.d/ebw3d.sh.sample
-share/doc/ebw3/INSTALL
-share/doc/ebw3/README
-share/doc/ebw3/README.port
-share/doc/ebw3/README.access
-@dirrm share/doc/ebw3
-@unexec rmdir %D/www/cgi-bin 2> /dev/null || true
diff --git a/japanese/elisa10x8/Makefile b/japanese/elisa10x8/Makefile
deleted file mode 100644
index 1a3fc661851a..000000000000
--- a/japanese/elisa10x8/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-# New ports collection makefile for:	elisafont
-# Date created:		26 Sep 1997
-# Whom: Dai ISHIJIMA & ELISA Font Project <ishijima@tri.pref.osaka.jp>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	elisa10x8
-PORTVERSION=	1.0
-CATEGORIES=	japanese x11-fonts
-MASTER_SITES=	# disappeared
-MASTER_SITE_SUBDIR=	xc/fonts/bdf/misc
-DISTFILES=	elisau10.tgz \
-		clR5x8.bdf
-EXTRACT_ONLY=	elisau10.tgz
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	X11 8-dot kanji font 'elisa font'
-
-DEPRECATED=		mastersite disappeared, only applied to antique X version
-EXPIRATION_DATE=	2005-10-11
-
-RUN_DEPENDS=	mkfontdir:${X_CLIENTS_PORT}
-
-USE_X_PREFIX=	yes
-
-.include <bsd.port.pre.mk>
-
-NO_WRKSUBDIR=	yes
-
-FONTSDIR=	lib/X11/fonts/local
-MAKE_ENV=	DISTDIR=${DISTDIR} FONTSDIR=${FONTSDIR}
-PLIST_SUB=	FONTSDIR=${FONTSDIR}
-
-pre-install:
-	@${SETENV} PKG_PREFIX=${PREFIX} \
-		${SH} ${PKGREQ} ${PKGNAME} INSTALL
-
-post-install:
-	@(cd ${PREFIX}/${FONTSDIR} ; mkfontdir)
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/elisa8
-	@${CP} ${WRKSRC}/elisa100.doc ${PREFIX}/share/doc/elisa8/
-	@${CP} ${WRKSRC}/elisau10.doc ${PREFIX}/share/doc/elisa8/
-	@${CP} ${WRKSRC}/hosoku.txt ${PREFIX}/share/doc/elisa8/
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/japanese/elisa10x8/distinfo b/japanese/elisa10x8/distinfo
deleted file mode 100644
index 13f283ba2eaf..000000000000
--- a/japanese/elisa10x8/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 (elisau10.tgz) = e14defd8b1f310241576686b6a2887a6
-SIZE (elisau10.tgz) = 125292
-MD5 (clR5x8.bdf) = 7c9c28f5a68a977e49f40f3f17044c35
-SIZE (clR5x8.bdf) = 14416
diff --git a/japanese/elisa10x8/files/patch-aa b/japanese/elisa10x8/files/patch-aa
deleted file mode 100644
index f43b75e711e0..000000000000
--- a/japanese/elisa10x8/files/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-*** /dev/null	Fri Sep 26 14:42:02 1997
---- Makefile	Fri Sep 26 15:43:17 1997
-***************
-*** 0 ****
---- 1,10 ----
-+ all:
-+ 	bdftopcf elisau10.bdf | gzip -c > elisau10.pcf.gz
-+ 	cp ${DISTDIR}/clR5x8.bdf .
-+ 	patch --quiet < clR5x8-s5x8.diff
-+ 	bdftopcf clR5x8.bdf   | gzip -c > clR5x8.pcf.gz
-+ 
-+ install:
-+ 	[ -d ${PREFIX}/${FONTSDIR} ] || mkdir -p ${PREFIX}/${FONTSDIR}
-+ 	cp elisau10.pcf.gz ${PREFIX}/${FONTSDIR}
-+ 	cp clR5x8.pcf.gz ${PREFIX}/${FONTSDIR}
diff --git a/japanese/elisa10x8/pkg-descr b/japanese/elisa10x8/pkg-descr
deleted file mode 100644
index c513b52238c6..000000000000
--- a/japanese/elisa10x8/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Japanese 8 dot font named `elisa font'.
-
-You can use 'elisa' as an alias for elisau10.pcf.Z, and 's5x8' for s5x8.pcf.Z.
-
-A simple usage:
-	% kterm -fn s5x8 -fr s5x8 -fk elisa
diff --git a/japanese/elisa10x8/pkg-plist b/japanese/elisa10x8/pkg-plist
deleted file mode 100644
index fc6045206459..000000000000
--- a/japanese/elisa10x8/pkg-plist
+++ /dev/null
@@ -1,10 +0,0 @@
-%%FONTSDIR%%/elisau10.pcf.gz
-%%FONTSDIR%%/clR5x8.pcf.gz
-share/doc/elisa8/elisa100.doc
-share/doc/elisa8/elisau10.doc
-share/doc/elisa8/hosoku.txt
-@exec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
-@unexec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
-@unexec if [ `wc -c %D/%%FONTSDIR%%/fonts.dir | awk '{print $1}'` = 2 ]; then rm -f %D/%%FONTSDIR%%/fonts.dir; fi
-@unexec if [ ! -s %D/%%FONTSDIR%%/fonts.alias ]; then rm -f %D/%%FONTSDIR%%/fonts.alias; fi
-@dirrm share/doc/elisa8
diff --git a/japanese/elisa10x8/pkg-req b/japanese/elisa10x8/pkg-req
deleted file mode 100644
index bc2c59f9c3c6..000000000000
--- a/japanese/elisa10x8/pkg-req
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-if [ "x$1" = "x" ]; then
-	exit 1;
-fi
-if [ "x$2" != "xINSTALL" -a "x$2" != "xDEINSTALL" ]; then
-	exit 1;
-fi
-
-export FONTDIR; FONTDIR=${PKG_PREFIX}/lib/X11/fonts/local
-
-if [ "$2x" = "INSTALLx" -a ! -d ${FONTDIR} ]; then
-	echo '**********************************************************************'
-	echo "****** ${FONTDIR}/ doesn't exist."
-	echo "****** Creating ${FONTDIR}/"
-	echo '****** Please upgrade your XFree86 to 3.3.3 or upper,'
-	echo "****** or add this directory to your /etc/XF86Config's FontPath entry."
-	echo '**********************************************************************'
-	mkdir ${FONTDIR}
-fi
-
-grepv() {
-	awk -v SRC=$1 'BEGIN{while (getline < SRC) {ENTRY[$0]=1}} (ENTRY[$0] != 1) {print}' $2
-}
-
-# font alias entry here!
-TMPFILE=/tmp/install-fonts-alias-$$
-cat << EOF > ${TMPFILE}
-elisa -elisa-fixed-medium-r-normal--10-70-75-75-c-100-jisx0208.1983-0
-s5x8  -schumacher-descent2clean-medium-r-normal--8-80-75-75-c-50-iso646.1991-irv
-EOF
-
-echo "Updating ${FONTDIR}/fonts.alias"
-cd ${FONTDIR}
-touch fonts.alias ${TMPFILE}
-cp fonts.alias fonts.alias.orig
-if [ "$2" = "INSTALL" ] ; then
-	(grepv ${TMPFILE} fonts.alias.orig; \
-	 cat ${TMPFILE}) > fonts.alias
-elif [ "$2" = "DEINSTALL" ] ; then
-	grepv ${TMPFILE} fonts.alias.orig > fonts.alias
-fi
-rm -f fonts.alias.orig ${TMPFILE}
-
-echo "**********************************************************"
-echo "You should restart X server or do 'xset fp rehash' command"
-echo "to enable this update."
-echo "**********************************************************"
-
-exit 0;
diff --git a/japanese/iv/Makefile b/japanese/iv/Makefile
deleted file mode 100644
index fd51df8cd256..000000000000
--- a/japanese/iv/Makefile
+++ /dev/null
@@ -1,107 +0,0 @@
-# New ports collection makefile for:	iv
-# Date created:		23.Feb.1996
-# Whom:			sanpei@yy.cs.keio.ac.jp
-#
-# $FreeBSD$
-#
-
-PORTNAME=	iv
-PORTVERSION=	3.1
-PORTREVISION=	1
-CATEGORIES=	japanese graphics
-MASTER_SITES=	ftp://interviews.stanford.edu/pub/ \
-		${MASTER_SITE_PORTS_JP}
-DISTFILES=	${PORTVERSION}.tar.Z \
-		${PORTNAME}${PORTVERSION:S/./_/g}j_gamma.tar.gz
-
-PATCH_SITES=	${MASTER_SITE_PORTS_JP}
-PATCHFILES=	${DISTNAME}j-gamma-fixcmpfont.patch
-PATCH_DIST_STRIP=	-p1
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A toolkit from Stanford University and Silicon Graphics + Japanese patches
-
-FORBIDDEN=	http://vuxml.FreeBSD.org/pkg-ja-iv.html
-EXPIRATION_DATE=2005-08-30
-
-# Warning: we cannot use USE_IMAKE.
-BUILD_DEPENDS=	imake:${X_IMAKE_PORT}
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} > 502112
-BROKEN=		"Does not compile on FreeBSD >= 5.x"
-.endif
-
-USE_GCC=	2.95
-USE_XLIB=	yes
-DIST_SUBDIR=	iv
-WRKSRC=		${WRKDIR}/iv
-MAKE_ENV=	CPU=`make CPU`
-
-MANPREFIX=	${PREFIX}/interviews
-MANN=		Adjuster.n Banner.n BasicDialog.n Border.n Box2_6.n \
-		BrushCmd.n Button2_6.n CGlue.n CSolver.n Catalog.n \
-		Clipboard.n ColorCmd.n Command.n CompletionEditor.n \
-		Component.n ComponentView.n ConnectTool.n Connector.n \
-		Control.n ControlInfo.n Creator.n Damage.n Data.n \
-		Deck2_6.n Dialog.n Dispatcher.n Editor.n EditorInfo.n \
-		EllipseComp.n ExternView.n FileBrowser.n FileChooser.n \
-		FontCmd.n Frame.n GVUpdater.n Glue2_6.n Graphic.n \
-		GraphicBlock.n GraphicComp.n GraphicCompTool.n \
-		GraphicView.n Grid.n IOCallback.n IOHandler.n \
-		ImportCmd.n Interactor.n Iterator.n KeyMap.n \
-		LineComp.n LinkComp.n MacroCmd.n MagnifyTool.n \
-		Manipulator.n MatchEditor.n Menu2_6.n Message.n \
-		MoveTool.n NOPCmd.n PadComp.n Page.n Painter.n \
-		Panner.n Path.n Pattern.n PatternCmd.n Perspective.n \
-		Picture.n PinComp.n PolygonComp.n PostScriptView.n \
-		RasterComp.n RasterRect.n RectComp.n Regexp.n ReqErr.n \
-		ReshapeTool.n Resource.n RotateTool.n RpcHdr.n \
-		RpcPeer.n RpcReader.n RpcRegistry.n RpcService.n \
-		RpcWriter.n Rubband.n ScaleTool.n Scene.n Scroller.n \
-		SelectTool.n Selection.n Sensor.n Shape.n SlotComp.n \
-		SplineComp.n StateVar.n StateVarView.n StencilComp.n \
-		StrBrowser.n StrChooser.n StretchTool.n StringEditor.n \
-		Subject.n TextBuffer.n TextComp.n TextDisplay.n \
-		TextEditor.n Tool.n TransferFunct.n Tray.n UArray.n \
-		UControl.n UHashTable.n ULabel.n UList.n UMap.n \
-		UStencil.n Unidraw.n UnidrawIntro.n Vertices.n \
-		VerticesComp.n Viewer.n Viewport.n World.n alert.n \
-		align.n catcmds.n classes.n datas.n dclock.n doc.n \
-		edit.n ellipses.n geomobjs.n globals.n ibuild.n \
-		iclass.n idraw.n ifb.n ifc.n iostreamb.n ivmkmf.n \
-		kybd.n lines.n logo.n mailbox.n manips.n polygons.n \
-		pspaint.n remind.n rpcbuf.n rpcstream.n splines.n \
-		statevars.n stateviews.n struct.n transfns.n \
-		transforms.n uctrls.n viewcmds.n
-
-INSTALLS_SHLIB=	yes
-.if ${PORTOBJFORMAT} == "elf"
-IV_LIB_VER=	3
-.else
-IV_LIB_VER=	3.1
-.endif
-
-pre-patch:
-	${PATCH} ${PATCH_DIST_ARGS} < ${WRKDIR}/diff-2.0gamma
-
-post-patch:
-	@(cd ${WRKSRC}/src/config/InterViews; ${MV} -f iv-freebsd.cf \
-	iv-freebsd.cf~; ${SED} -e 's/%%CXX%%/${CXX}/' iv-freebsd.cf~ \
-	> iv-freebsd.cf)
-.if ${OSVERSION} >= 400002
-	@(cd ${WRKSRC}/src/config/InterViews; ${MV} -f iv-freebsd.cf \
-	iv-freebsd.cf~; ${SED} -e 's/\-lg\+\+//' iv-freebsd.cf~ \
-	> iv-freebsd.cf)
-.endif
-
-post-install:
-	@${INSTALL_DATA} ${WRKDIR}/idraw-3_1j.ad ${PREFIX}/interviews/lib/all/app-defaults/idraw
-# need these in ${PREFIX}/lib so that ldconfig can find them
-	@${LN} -fs ../interviews/lib/libIV.so.${IV_LIB_VER} ${PREFIX}/lib
-	@${LN} -fs ../interviews/lib/libUnidraw.so.${IV_LIB_VER} ${PREFIX}/lib
-	@${LN} -fs ${PREFIX}/lib/libIV.so.${IV_LIB_VER} ${PREFIX}/lib/libIV.so
-	@${LN} -fs ${PREFIX}/lib/libUnidraw.so.${IV_LIB_VER} ${PREFIX}/lib/libUnidraw.so
-
-.include <bsd.port.post.mk>
diff --git a/japanese/iv/distinfo b/japanese/iv/distinfo
deleted file mode 100644
index b7c888703117..000000000000
--- a/japanese/iv/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 (iv/3.1.tar.Z) = 83707e13b4ca484e0d98c41bc76a6e64
-SIZE (iv/3.1.tar.Z) = 3771112
-MD5 (iv/iv3_1j_gamma.tar.gz) = 9e9f04128ee98bc3de3ca016902c4e4c
-SIZE (iv/iv3_1j_gamma.tar.gz) = 46046
-MD5 (iv/iv-3.1j-gamma-fixcmpfont.patch) = ac6b9e65dd4d93b4f621b4b4eec602a7
-SIZE (iv/iv-3.1j-gamma-fixcmpfont.patch) = 4714
diff --git a/japanese/iv/files/patch-aa b/japanese/iv/files/patch-aa
deleted file mode 100644
index 712f5d61ae2b..000000000000
--- a/japanese/iv/files/patch-aa
+++ /dev/null
@@ -1,320 +0,0 @@
-*** src/bin/iclass/dialogs.c.orig	Tue Jul  8 23:30:56 2003
---- src/bin/iclass/dialogs.c	Wed Jul  9 00:14:41 2003
-***************
-*** 40,51 ****
-  
-  #include <stdlib.h>
-  #include <string.h>
-  #include <osfcn.h>
-  
-  #if !defined(AIXV3) && !defined(hpux) && !(defined(sun) && OSMajorVersion >= 5) && !defined(__386BSD__) && !defined(linux)
-  /* sigh, not all systems have this prototype */
-  extern "C" {
-!     char* getcwd(char*, int);
-  }
-  #endif
-  
---- 40,56 ----
-  
-  #include <stdlib.h>
-  #include <string.h>
-+ #if __FreeBSD__ >= 2
-+ #include <osreldate.h>
-+ #if (__FreeBSD_cc_version < 400002 && __FreeBSD_version < 500000)
-  #include <osfcn.h>
-+ #endif
-+ #endif
-  
-  #if !defined(AIXV3) && !defined(hpux) && !(defined(sun) && OSMajorVersion >= 5) && !defined(__386BSD__) && !defined(linux)
-  /* sigh, not all systems have this prototype */
-  extern "C" {
-!     char* getcwd(char*, unsigned int);
-  }
-  #endif
-  
-*** src/bin/scripts/Imakefile	Thu Sep 12 15:01:39 1991
---- /usr/oports/x11/iv/src/bin/scripts/Imakefile	Tue Apr 26 17:01:52 1994
-***************
-*** 11,16 ****
---- 11,17 ----
-  
-  AllTarget($(PROGRAMS))
-  
-+ CPP = /usr/bin/cpp
-  CppScriptTarget(cpu,cpu.cpp,-DCPU='"'"$(ARCH)"'"',always)
-  CppScriptTarget(ibmkmf,ibmkmf.cpp,-DCONFIGDIRSPEC='$(CONFIGDIRSPEC)',always)
-  CppScriptTarget(ivmkmf,ivmkmf.cpp,-DCONFIGDIRSPEC='$(CONFIGDIRSPEC)',always)
-*** src/bin/scripts/remind.cpp	Wed Jun  3 21:37:00 1992
---- /usr/oports/x11/iv/src/bin/scripts/remind.cpp	Tue Apr 26 17:01:53 1994
-***************
-*** 34,40 ****
-  ' > $tmp
-  
-  cat $MacrosFile $RemindersFile \
-!     | /lib/cpp \
-      | egrep -f $tmp \
-      | awk '
-  	/[0-9][0-9]?:[0-9][0-9]?/ {
---- 34,40 ----
-  ' > $tmp
-  
-  cat $MacrosFile $RemindersFile \
-!     | /usr/bin/cpp \
-      | egrep -f $tmp \
-      | awk '
-  	/[0-9][0-9]?:[0-9][0-9]?/ {
-*** src/config/InterViews/TIFF.def	Fri Dec 11 15:33:54 1992
---- /usr/oports/x11/iv/src/config/InterViews/TIFF.def	Tue Apr 26 17:01:54 1994
-***************
-*** 90,95 ****
---- 90,100 ----
-   *
-   */
-  #ifndef TIFFStdCDefines
-+ #if defined(FreeBSDArchitecture)
-+ #define TIFFStdCDefines \
-+     -DCOLORIMETRY_SUPPORT -DYCBCR_SUPPORT -DMMAP_SUPPORT \
-+     -DHAVE_IEEEFP=1 -DUSE_VARARGS=1 -DUSE_PROTOTYPES=1 -DUSE_CONST=1
-+ #endif
-  #if defined(SGIArchitecture)
-  #define TIFFStdCDefines \
-      -DCOLORIMETRY_SUPPORT -DJPEG_SUPPORT -DYCBCR_SUPPORT -DCMYK_SUPPORT \
-*** src/config/InterViews/arch.def	Fri Dec 11 15:34:52 1992
---- /usr/oports/x11/iv/src/config/InterViews/arch.def	Tue Apr 26 17:01:55 1994
-***************
-*** 385,390 ****
---- 385,400 ----
-  #define MacroFile InterViews/iv-convex.cf
-  #endif /* __convex__ */
-  
-+ #ifdef __FreeBSD__
-+ #undef freebsd
-+ #undef FREEBSD
-+ #define FreeBSDArchitecture
-+ #define ArchitectureName FREEBSD
-+ #define architectureName freebsd
-+ #define MacroIncludeFile <InterViews/iv-freebsd.cf>
-+ #define MacroFile InterViews/iv-freebsd.cf
-+ #endif
-+ 
-  #ifndef ArchitectureName
-  XCOMM WARNING: Imakefile not configured; guessing at definitions!!!
-  XCOMM This might mean that BOOTSTRAPCFLAGS was not set when building imake.
-*** src/config/InterViews/local.def	Tue Nov 24 12:08:51 1992
---- /usr/oports/x11/iv/src/config/InterViews/local.def	Thu Jun 16 18:34:11 1994
-***************
-*** 8,14 ****
-  /*
-   * If you are using gcc/g++, then uncomment the include below.
-   */
-! /* #include <InterViews/gcc.def> */
-  
-  /*
-   * Default customization of kits.
---- 8,19 ----
-  /*
-   * If you are using gcc/g++, then uncomment the include below.
-   */
-! #include <InterViews/gcc.def>
-! 
-! #if defined(FreeBSDArchitecture)
-! #undef HasSunOSSharedLibs
-! #define HasSunOSSharedLibs YES
-! #endif
-  
-  /*
-   * Default customization of kits.
-***************
-*** 33,38 ****
---- 38,48 ----
-  #define BuildRPCClasses YES
-  #endif
-  
-+ #if defined (FreeBSDArchitecture)
-+ #undef BuildRPCClasses
-+ #define BuildRPCClasses NO
-+ #endif
-+ 
-  /*
-   * Delete this definition if your /tmp space is less than five megabytes.
-   */
-***************
-*** 49,55 ****
-   * installed data files.
-   */
-  #undef InstalledRoot
-! #define InstalledRoot /interviews
-  
-  /*
-   * If the X11 config files are not in /usr/lib/X11/config, the X11
---- 59,65 ----
-   * installed data files.
-   */
-  #undef InstalledRoot
-! #define InstalledRoot /usr/local/interviews
-  
-  /*
-   * If the X11 config files are not in /usr/lib/X11/config, the X11
-***************
-*** 60,70 ****
-   * If you have to set XConfigDir, don't forget to override XCONFIGDIR
-   * on the command line when saying "make World" for the first time.
-   */
-! /*
-  #undef XConfigDir
-! #define XConfigDir /usr/X11R5/lib/X11/config
-  #undef XIncDir
-! #define XIncDir /usr/X11R5/include
-  #undef XLibDir
-! #define XLibDir /usr/X11R5/lib
-! */
---- 70,80 ----
-   * If you have to set XConfigDir, don't forget to override XCONFIGDIR
-   * on the command line when saying "make World" for the first time.
-   */
-! 
-  #undef XConfigDir
-! #define XConfigDir /usr/X11R6/lib/X11/config
-  #undef XIncDir
-! #define XIncDir /usr/X11R6/include
-  #undef XLibDir
-! #define XLibDir /usr/X11R6/lib
-! 
-*** src/lib/IV-X11/xwindow.c	Mon Nov 23 12:26:43 1992
---- /usr/oports/x11/iv/src/lib/IV-X11/xwindow.c	Tue Apr 26 17:03:44 1994
-***************
-*** 64,70 ****
-  
-  /* no standard place for this */
-  extern "C" {
-!     extern int ioctl(int, int, ...);
-  }
-  
-  implementPtrList(WindowVisualList,WindowVisual)
---- 64,70 ----
-  
-  /* no standard place for this */
-  extern "C" {
-!     extern int ioctl(int, long unsigned int, ...);
-  }
-  
-  implementPtrList(WindowVisualList,WindowVisual)
-*** src/lib/OS/string.c	Mon Jul 13 10:54:03 1992
---- /usr/oports/x11/iv/src/lib/OS/string.c	Thu Jun 16 18:37:30 1994
-***************
-*** 31,41 ****
---- 31,43 ----
-   */
-  
-  extern "C" {
-+ #ifndef __FreeBSD__
-  #ifndef tolower
-      extern int tolower(int);
-  #endif
-  #ifndef toupper
-      extern int toupper(int);
-+ #endif
-  #endif
-      extern long int strtol(const char*, char**, int);
-      extern double strtod(const char*, char**);
-*** src/lib/TIFF/mkg3states.c	Fri Mar  6 11:11:03 1992
---- /usr/oports/x11/iv/src/lib/TIFF/mkg3states.c	Tue Apr 26 17:03:59 1994
-***************
-*** 68,73 ****
---- 68,74 ----
-   * END (from the original source)
-   */
-  #include <stdio.h>
-+ #define va_dcl /**/
-  #include "prototypes.h"
-  
-  #ifndef TRUE
-*** src/lib/TIFF/prototypes.h	Tue Feb 18 18:20:12 1992
---- /usr/oports/x11/iv/src/lib/TIFF/prototypes.h	Tue Apr 26 17:03:59 1994
-***************
-*** 25,30 ****
---- 25,31 ----
-   */
-  
-  #if USE_PROTOTYPES
-+ va_dcl
-  #define	DECLARE1(f,t1,a1)		f(t1 a1)
-  #define	DECLARE2(f,t1,a1,t2,a2)		f(t1 a1, t2 a2)
-  #define	DECLARE3(f,t1,a1,t2,a2,t3,a3)	f(t1 a1, t2 a2, t3 a3)
-*** ./src/bin/ibuild/ibcmds.c.orig	Sat Dec 12 13:33:25 1992
---- ./src/bin/ibuild/ibcmds.c	Wed Jul  9 00:09:35 2003
-***************
-*** 86,92 ****
---- 86,101 ----
-  #undef FileChooser
-  #define FileChooser _lib_iv(FileChooser)
-  
-+ #if __FreeBSD__ >= 2
-+ #include <osreldate.h>
-+ #if (__FreeBSD_cc_version < 400002 && __FreeBSD_version < 500000)
-  #include <osfcn.h>
-+ #endif
-+ #endif
-+ #if __FreeBSD_cc_version >= 400003
-+ #include <unistd.h>
-+ #endif
-+ 
-  #include <stdio.h>
-  #include <stdlib.h>
-  #include <stream.h>
-***************
-*** 111,119 ****
-  #define  getwd(a) getcwd(a,MAXPATHLEN)
-  #endif
-  
-! #ifdef __DECCXX
-  extern "C" {
-      int getwd(char*);
-      int vfork();
-      int execlp(char*, ...);
-      int unlink(char*);
---- 120,130 ----
-  #define  getwd(a) getcwd(a,MAXPATHLEN)
-  #endif
-  
-! #if (defined(__DECCXX) || (__FreeBSD_version > 500000))
-  extern "C" {
-+ #if !defined(__FreeBSD__)
-      int getwd(char*);
-+ #endif
-      int vfork();
-      int execlp(char*, ...);
-      int unlink(char*);
-***************
-*** 2407,2421 ****
-  	EditorInfo* installed = (EditorInfo*) toolsdialog.Installed();
-          EditorInfo* removed = (EditorInfo*) toolsdialog.Removed();
-  
-! 	Iterator i;
-! 	for (unidraw->First(i); !unidraw->Done(i); unidraw->Next(i)) {
-! 	    IBEditor* iEd = (IBEditor*) unidraw->GetEditor(i);
-  	    ToolPanel* itoolpanel = iEd->GetToolPanel();
-  
-              for (int i = 0; i < installed->Count(); i++) {
-                  itoolpanel->Install(installed->GetName(i));
-              }
-!             for (i = 0; i < removed->Count(); i++) {
-                  itoolpanel->Uninstall(removed->GetName(i));
-              }
-              itoolpanel->Change();
---- 2418,2432 ----
-  	EditorInfo* installed = (EditorInfo*) toolsdialog.Installed();
-          EditorInfo* removed = (EditorInfo*) toolsdialog.Removed();
-  
-! 	Iterator ii;
-! 	for (unidraw->First(ii); !unidraw->Done(ii); unidraw->Next(ii)) {
-! 	    IBEditor* iEd = (IBEditor*) unidraw->GetEditor(ii);
-  	    ToolPanel* itoolpanel = iEd->GetToolPanel();
-  
-              for (int i = 0; i < installed->Count(); i++) {
-                  itoolpanel->Install(installed->GetName(i));
-              }
-!             for (int i = 0; i < removed->Count(); i++) {
-                  itoolpanel->Uninstall(removed->GetName(i));
-              }
-              itoolpanel->Change();
diff --git a/japanese/iv/files/patch-ac b/japanese/iv/files/patch-ac
deleted file mode 100644
index d02518bcc90d..000000000000
--- a/japanese/iv/files/patch-ac
+++ /dev/null
@@ -1,16 +0,0 @@
-*** src/config/InterViews/iv-freebsd.cf	Mon Oct 31 17:31:42 1994
---- src/config/InterViews/iv-freebsd.cf	Mon Oct 31 17:36:04 1994
-***************
-*** 0 ****
---- 1,11 ----
-+ #include <InterViews/xparams.cf>
-+ #undef CppCmd
-+ #define CppCmd cpp
-+ #undef CCDriver
-+ #define CCDriver c++
-+ #undef DependCCFlags
-+ #define DependCCFlags $(CCDEFINES) $(CCINCLUDES) -I/usr/include/g++
-+ #undef ExtraCCLdLibs
-+ #define ExtraCCLdLibs -lg++
-+ #undef SharedCCFlags
-+ #define SharedCCFlags -fpic
diff --git a/japanese/iv/files/patch-ad b/japanese/iv/files/patch-ad
deleted file mode 100644
index f0a65381c448..000000000000
--- a/japanese/iv/files/patch-ad
+++ /dev/null
@@ -1,1174 +0,0 @@
-diff -rc --exclude=Makefile --exclude=FREEBSD work-orig/iv/src/bin/idraw/idcmds.c ./src/bin/idraw/idcmds.c
-*** work-orig/iv/src/bin/idraw/idcmds.c	Sat May 23 03:37:32 1992
---- ./src/bin/idraw/idcmds.c	Mon May 29 20:18:43 1995
-***************
-*** 26,32 ****
-  
-  #include "ided.h"
-  #include "idclasses.h"
-- #include "idcmds.h"
-  #include "idcomp.h"
-  #include "iddialogs.h"
-  #include "idvars.h"
---- 26,31 ----
-***************
-*** 46,56 ****
-  #include <Unidraw/Commands/edit.h>
-  #include <Unidraw/Commands/transforms.h>
-  
-- #undef FileChooser
-- #define FileChooser _lib_iv(FileChooser)
-- 
-  #include <stream.h>
-  
-  /*****************************************************************************/
-  
-  ClassId OpenCmd::GetClassId () { return OPEN_CMD; }
---- 45,53 ----
-  #include <Unidraw/Commands/edit.h>
-  #include <Unidraw/Commands/transforms.h>
-  
-  #include <stream.h>
-  
-+ #include "idcmds.h"
-  /*****************************************************************************/
-  
-  ClassId OpenCmd::GetClassId () { return OPEN_CMD; }
-***************
-*** 59,66 ****
-      return OPEN_CMD == id || ViewCompCmd::IsA(id);
-  }
-  
-! OpenCmd::OpenCmd (ControlInfo* c, FileChooser* fc) : ViewCompCmd(c, fc) { }
-! OpenCmd::OpenCmd (Editor* ed, FileChooser* fc) : ViewCompCmd(ed, fc) { }
-  
-  Command* OpenCmd::Copy () {
-      Command* copy = new OpenCmd(CopyControlInfo());
---- 56,63 ----
-      return OPEN_CMD == id || ViewCompCmd::IsA(id);
-  }
-  
-! OpenCmd::OpenCmd (ControlInfo* c, FileChooser* fc) : ViewCompCmd(c, fc) { };
-! OpenCmd::OpenCmd (Editor* ed, FileChooser* fc) : ViewCompCmd(ed, fc) { };
-  
-  Command* OpenCmd::Copy () {
-      Command* copy = new OpenCmd(CopyControlInfo());
-diff -rc --exclude=Makefile --exclude=FREEBSD work-orig/iv/src/config/InterViews/iv-freebsd.cf ./src/config/InterViews/iv-freebsd.cf
-*** work-orig/iv/src/config/InterViews/iv-freebsd.cf	Wed May 31 08:52:13 1995
---- ./src/config/InterViews/iv-freebsd.cf	Mon May 29 21:55:00 1995
-***************
-*** 2,8 ****
-  #undef CppCmd
-  #define CppCmd cpp
-  #undef CCDriver
-! #define CCDriver c++
-  #undef DependCCFlags
-  #define DependCCFlags $(CCDEFINES) $(CCINCLUDES) -I/usr/include/g++
-  #undef ExtraCCLdLibs
---- 2,8 ----
-  #undef CppCmd
-  #define CppCmd cpp
-  #undef CCDriver
-! #define CCDriver %%CXX%%
-  #undef DependCCFlags
-  #define DependCCFlags $(CCDEFINES) $(CCINCLUDES) -I/usr/include/g++
-  #undef ExtraCCLdLibs
-diff -rc --exclude=Makefile --exclude=FREEBSD work-orig/iv/src/config/InterViews/local.def ./src/config/InterViews/local.def
-*** work-orig/iv/src/config/InterViews/local.def	Wed May 31 08:52:10 1995
---- ./src/config/InterViews/local.def	Mon May 29 23:56:31 1995
-***************
-*** 10,18 ****
-   */
-  #include <InterViews/gcc.def>
-  
-! #if defined(FreeBSDArchitecture)
-  #undef HasSunOSSharedLibs
-  #define HasSunOSSharedLibs YES
-  #endif
-  
-  /*
---- 10,20 ----
-   */
-  #include <InterViews/gcc.def>
-  
-! #if defined (FreeBSDArchitecture)
-  #undef HasSunOSSharedLibs
-  #define HasSunOSSharedLibs YES
-+ #undef HasSunOSSharedLibraries
-+ #define HasSunOSSharedLibraries YES
-  #endif
-  
-  /*
-***************
-*** 47,53 ****
-   * Delete this definition if your /tmp space is less than five megabytes.
-   */
-  #undef HasLargeTmp
-- #define HasLargeTmp YES
-  
-  /*
-   * If you do not want to create a symbolic link called "/interviews"
---- 49,54 ----
-***************
-*** 77,80 ****
---- 78,84 ----
-  #define XIncDir /usr/X11R6/include
-  #undef XLibDir
-  #define XLibDir /usr/X11R6/lib
-+ 
-+ #undef SharedCCFlags
-+ #define SharedCCFlags -fpic
-  
-diff -rc --exclude=Makefile --exclude=FREEBSD work-orig/iv/src/include/IV-X11/xwindow.h ./src/include/IV-X11/xwindow.h
-*** work-orig/iv/src/include/IV-X11/xwindow.h	Fri Sep 25 07:46:22 1992
---- ./src/include/IV-X11/xwindow.h	Sun May 28 12:49:16 1995
-***************
-*** 46,53 ****
-  class Style;
-  class WindowCursorStack;
-  class WindowTable;
-  class XDisplay;
-! 
-  struct WindowOverlayInfo {
-      VisualID id_;
-      long type_;
---- 46,58 ----
-  class Style;
-  class WindowCursorStack;
-  class WindowTable;
-+ /*
-+  * modified by jj@ldjpc.apana.org.au
-+  *
-+  * this seems to break the compile...
-  class XDisplay;
-!  *
-!  */
-  struct WindowOverlayInfo {
-      VisualID id_;
-      long type_;
-diff -rc --exclude=Makefile --exclude=FREEBSD work-orig/iv/src/include/InterViews/_defines.h ./src/include/InterViews/_defines.h
-*** work-orig/iv/src/include/InterViews/_defines.h	Wed May 13 06:29:09 1992
---- ./src/include/InterViews/_defines.h	Mon May 29 18:24:27 1995
-***************
-*** 1,14 ****
-! #define Alignment _lib_iv(Alignment)
-! #define ColorIntensity _lib_iv(ColorIntensity)
-! #define ColorOp _lib_iv(ColorOp)
-! #define Coord _lib_iv(Coord)
-! #define EventType _lib_iv(EventType)
-! #define EventButton _lib_iv(EventButton)
-! #define GlyphBreakType _lib_iv(GlyphBreakType)
-! #define GlyphIndex _lib_iv(GlyphIndex)
-! #define IntCoord _lib_iv(IntCoord)
-! #define PixelCoord _lib_iv(PixelCoord)
-! #define Selection _lib_iv(Selection)
-  #define Action _lib_iv(Action)
-  #define ActiveHandler _lib_iv(ActiveHandler)
-  #define Adjustable _lib_iv(Adjustable)
---- 1,4 ----
-! #define AcknowledgeDialog _lib_iv(AcknowledgeDialog)
-  #define Action _lib_iv(Action)
-  #define ActiveHandler _lib_iv(ActiveHandler)
-  #define Adjustable _lib_iv(Adjustable)
-***************
-*** 16,21 ****
---- 6,14 ----
-  #define Aggregate _lib_iv(Aggregate)
-  #define AggregateInfo_List _lib_iv(AggregateInfo_List)
-  #define Align _lib_iv(Align)
-+ #define AlignCmd _lib_iv(AlignCmd)
-+ #define AlignToGridCmd _lib_iv(AlignToGridCmd)
-+ #define Alignment _lib_iv(Alignment)
-  #define Allocation _lib_iv(Allocation)
-  #define AllocationInfo _lib_iv(AllocationInfo)
-  #define AllocationTable _lib_iv(AllocationTable)
-***************
-*** 24,31 ****
---- 17,26 ----
-  #define ApplicationWindow _lib_iv(ApplicationWindow)
-  #define ArrayCompositor _lib_iv(ArrayCompositor)
-  #define ArrowSubclassName _lib_iv(ArrowSubclassName)
-+ #define BackCmd _lib_iv(BackCmd)
-  #define Background _lib_iv(Background)
-  #define Banner _lib_iv(Banner)
-+ #define BasicDialog _lib_iv(BasicDialog)
-  #define Bevel _lib_iv(Bevel)
-  #define BevelFrame _lib_iv(BevelFrame)
-  #define Bitmap _lib_iv(Bitmap)
-***************
-*** 36,89 ****
---- 31,158 ----
-  #define BoxCanonical _lib_iv(BoxCanonical)
-  #define BoxElement _lib_iv(BoxElement)
-  #define BoxImpl _lib_iv(BoxImpl)
-+ #define BoxObj _lib_iv(BoxObj)
-  #define Break _lib_iv(Break)
-  #define Break_List _lib_iv(Break_List)
-  #define Browser _lib_iv(Browser)
-  #define BrowserList _lib_iv(BrowserList)
-  #define Brush _lib_iv(Brush)
-+ #define BrushCmd _lib_iv(BrushCmd)
-  #define BrushImpl _lib_iv(BrushImpl)
-  #define BrushRep _lib_iv(BrushRep)
-+ #define BrushVar _lib_iv(BrushVar)
-+ #define BrushVarView _lib_iv(BrushVarView)
-  #define Button _lib_iv(Button)
-  #define ButtonList _lib_iv(ButtonList)
-  #define ButtonState _lib_iv(ButtonState)
-+ #define CCnxn _lib_iv(CCnxn)
-+ #define CCnxn_HashTable _lib_iv(CCnxn_HashTable)
-+ #define CGlue _lib_iv(CGlue)
-+ #define CNet _lib_iv(CNet)
-+ #define CSolver _lib_iv(CSolver)
-+ #define CSolverInfo _lib_iv(CSolverInfo)
-+ #define CSolverState _lib_iv(CSolverState)
-  #define Canvas _lib_iv(Canvas)
-  #define CanvasDamage _lib_iv(CanvasDamage)
-  #define CanvasRep _lib_iv(CanvasRep)
-  #define Card _lib_iv(Card)
-+ #define Catalog _lib_iv(Catalog)
-+ #define CatalogChooser _lib_iv(CatalogChooser)
-+ #define CenterCmd _lib_iv(CenterCmd)
-  #define CenterLayout _lib_iv(CenterLayout)
-  #define Character _lib_iv(Character)
-  #define CheckBox _lib_iv(CheckBox)
-  #define ChoiceItem _lib_iv(ChoiceItem)
-+ #define ClassId _lib_iv(ClassId)
-+ #define Clipboard _lib_iv(Clipboard)
-  #define ClippingStack _lib_iv(ClippingStack)
-+ #define CloseEditorCmd _lib_iv(CloseEditorCmd)
-+ #define ClosedBSpline _lib_iv(ClosedBSpline)
-+ #define ClosedSplineComp _lib_iv(ClosedSplineComp)
-+ #define ClosedSplineView _lib_iv(ClosedSplineView)
-  #define Color _lib_iv(Color)
-+ #define ColorCmd _lib_iv(ColorCmd)
-+ #define ColorData _lib_iv(ColorData)
-  #define ColorImpl _lib_iv(ColorImpl)
-+ #define ColorIntensity _lib_iv(ColorIntensity)
-+ #define ColorOp _lib_iv(ColorOp)
-  #define ColorRep _lib_iv(ColorRep)
-  #define ColorTable _lib_iv(ColorTable)
-+ #define ColorVar _lib_iv(ColorVar)
-+ #define Command _lib_iv(Command)
-+ #define CommandControl _lib_iv(CommandControl)
-+ #define CommandInteractor _lib_iv(CommandInteractor)
-+ #define CompNameVar _lib_iv(CompNameVar)
-+ #define CompNameVarView _lib_iv(CompNameVarView)
-  #define CompletionEditor _lib_iv(CompletionEditor)
-+ #define Component _lib_iv(Component)
-+ #define ComponentView _lib_iv(ComponentView)
-  #define Composition _lib_iv(Composition)
-  #define CompositionComponent_List _lib_iv(CompositionComponent_List)
-  #define Compositor _lib_iv(Compositor)
-+ #define ConfirmDialog _lib_iv(ConfirmDialog)
-+ #define ConnInfo _lib_iv(ConnInfo)
-+ #define ConnectCmd _lib_iv(ConnectCmd)
-+ #define ConnectManip _lib_iv(ConnectManip)
-+ #define ConnectTool _lib_iv(ConnectTool)
-+ #define Connector _lib_iv(Connector)
-+ #define ConnectorView _lib_iv(ConnectorView)
-  #define Control _lib_iv(Control)
-+ #define ControlInfo _lib_iv(ControlInfo)
-  #define ControlState _lib_iv(ControlState)
-+ #define Coord _lib_iv(Coord)
-+ #define CoordinateSpace _lib_iv(CoordinateSpace)
-+ #define CopyCmd _lib_iv(CopyCmd)
-+ #define Creator _lib_iv(Creator)
-  #define Cursor _lib_iv(Cursor)
-  #define CursorRep _lib_iv(CursorRep)
-  #define CursorRepBitmap _lib_iv(CursorRepBitmap)
-  #define CursorRepData _lib_iv(CursorRepData)
-  #define CursorRepFont _lib_iv(CursorRepFont)
-  #define CursorRepXFont _lib_iv(CursorRepXFont)
-+ #define CutCmd _lib_iv(CutCmd)
-+ #define Damage _lib_iv(Damage)
-  #define DamageList _lib_iv(DamageList)
-+ #define Data _lib_iv(Data)
-+ #define DataCache _lib_iv(DataCache)
-  #define DebugGlyph _lib_iv(DebugGlyph)
-  #define Deck _lib_iv(Deck)
-+ #define DeleteCmd _lib_iv(DeleteCmd)
-  #define Dialog _lib_iv(Dialog)
-  #define DialogKit _lib_iv(DialogKit)
-+ #define DialogKitImpl _lib_iv(DialogKitImpl)
-  #define Display _lib_iv(Display)
-  #define DisplayRep _lib_iv(DisplayRep)
-  #define DownMover _lib_iv(DownMover)
-+ #define Drag _lib_iv(Drag)
-+ #define DragManip _lib_iv(DragManip)
-+ #define DragRep _lib_iv(DragRep)
-+ #define DragZone _lib_iv(DragZone)
-+ #define DragZoneRep _lib_iv(DragZoneRep)
-+ #define DragZoneSink _lib_iv(DragZoneSink)
-+ #define DragZoneSinkHandler _lib_iv(DragZoneSinkHandler)
-+ #define DupCmd _lib_iv(DupCmd)
-+ #define Editor _lib_iv(Editor)
-+ #define EditorImpl _lib_iv(EditorImpl)
-+ #define EditorInfo _lib_iv(EditorInfo)
-+ #define Ellipse _lib_iv(Ellipse)
-+ #define EllipseComp _lib_iv(EllipseComp)
-+ #define EllipseView _lib_iv(EllipseView)
-  #define Enlarger _lib_iv(Enlarger)
-  #define Event _lib_iv(Event)
-+ #define EventButton _lib_iv(EventButton)
-  #define EventRep _lib_iv(EventRep)
-+ #define EventType _lib_iv(EventType)
-  #define Extension _lib_iv(Extension)
-+ #define Extent _lib_iv(Extent)
-+ #define ExternView _lib_iv(ExternView)
-  #define FBDirectory _lib_iv(FBDirectory)
-+ #define F_Circle _lib_iv(F_Circle)
-+ #define F_ClosedBSpline _lib_iv(F_ClosedBSpline)
-+ #define F_Ellipse _lib_iv(F_Ellipse)
-+ #define F_OpenBSpline _lib_iv(F_OpenBSpline)
-+ #define F_Polygon _lib_iv(F_Polygon)
-+ #define F_Rect _lib_iv(F_Rect)
-  #define FieldEditor _lib_iv(FieldEditor)
-  #define FieldEditorAction _lib_iv(FieldEditorAction)
-  #define FieldEditorImpl _lib_iv(FieldEditorImpl)
-***************
-*** 92,113 ****
---- 161,210 ----
-  #define FileChooser _lib_iv(FileChooser)
-  #define FileChooserAction _lib_iv(FileChooserAction)
-  #define FileChooserImpl _lib_iv(FileChooserImpl)
-+ #define FileNameVarView _lib_iv(FileNameVarView)
-+ #define FillPolygonObj _lib_iv(FillPolygonObj)
-  #define FixedLayout _lib_iv(FixedLayout)
-+ #define FixedPin _lib_iv(FixedPin)
-  #define Font _lib_iv(Font)
-  #define FontBoundingBox _lib_iv(FontBoundingBox)
-+ #define FontCmd _lib_iv(FontCmd)
-  #define FontFamily _lib_iv(FontFamily)
-  #define FontFamilyImpl _lib_iv(FontFamilyImpl)
-  #define FontFamilyRep _lib_iv(FontFamilyRep)
-  #define FontImpl _lib_iv(FontImpl)
-  #define FontRep _lib_iv(FontRep)
-+ #define FontVar _lib_iv(FontVar)
-+ #define FontVarView _lib_iv(FontVarView)
-  #define Frame _lib_iv(Frame)
-+ #define FrontCmd _lib_iv(FrontCmd)
-+ #define FullGraphic _lib_iv(FullGraphic)
-  #define GLContext _lib_iv(GLContext)
-  #define GLContextImpl _lib_iv(GLContextImpl)
-  #define GLWindow _lib_iv(GLWindow)
-+ #define GSData _lib_iv(GSData)
-+ #define GVU_HashTable _lib_iv(GVU_HashTable)
-+ #define GVUpdater _lib_iv(GVUpdater)
-  #define Glue _lib_iv(Glue)
-  #define Glyph _lib_iv(Glyph)
-+ #define GlyphBreakType _lib_iv(GlyphBreakType)
-+ #define GlyphIndex _lib_iv(GlyphIndex)
-  #define GrabList _lib_iv(GrabList)
-+ #define Graphic _lib_iv(Graphic)
-+ #define GraphicBlock _lib_iv(GraphicBlock)
-+ #define GraphicComp _lib_iv(GraphicComp)
-+ #define GraphicCompTool _lib_iv(GraphicCompTool)
-+ #define GraphicComps _lib_iv(GraphicComps)
-+ #define GraphicView _lib_iv(GraphicView)
-+ #define GraphicViews _lib_iv(GraphicViews)
-+ #define GravityCmd _lib_iv(GravityCmd)
-+ #define GravityVar _lib_iv(GravityVar)
-+ #define GravityVarView _lib_iv(GravityVarView)
-+ #define Grid _lib_iv(Grid)
-+ #define GridCmd _lib_iv(GridCmd)
-+ #define GridDialog _lib_iv(GridDialog)
-+ #define GridSpacingCmd _lib_iv(GridSpacingCmd)
-  #define Group _lib_iv(Group)
-+ #define GroupCmd _lib_iv(GroupCmd)
-  #define GrowingBSpline _lib_iv(GrowingBSpline)
-  #define GrowingClosedBSpline _lib_iv(GrowingClosedBSpline)
-  #define GrowingMultiLine _lib_iv(GrowingMultiLine)
-***************
-*** 116,134 ****
---- 213,240 ----
-  #define HBorder _lib_iv(HBorder)
-  #define HBox _lib_iv(HBox)
-  #define HGlue _lib_iv(HGlue)
-+ #define HPanelControl _lib_iv(HPanelControl)
-  #define HRule _lib_iv(HRule)
-  #define HScrollBar _lib_iv(HScrollBar)
-  #define HScroller _lib_iv(HScroller)
-+ #define HSlotComp _lib_iv(HSlotComp)
-+ #define HSlotView _lib_iv(HSlotView)
-  #define Handler _lib_iv(Handler)
-+ #define HistoryMap _lib_iv(HistoryMap)
-  #define Hit _lib_iv(Hit)
-  #define HitImpl _lib_iv(HitImpl)
-  #define IconWindow _lib_iv(IconWindow)
-  #define Image _lib_iv(Image)
-+ #define ImportCmd _lib_iv(ImportCmd)
-+ #define InorderView _lib_iv(InorderView)
-  #define InputHandler _lib_iv(InputHandler)
-  #define InputHandlerImpl _lib_iv(InputHandlerImpl)
-+ #define IntCoord _lib_iv(IntCoord)
-  #define Interactor _lib_iv(Interactor)
-  #define InteractorHandler _lib_iv(InteractorHandler)
-  #define InteractorWindow _lib_iv(InteractorWindow)
-+ #define Iterator _lib_iv(Iterator)
-+ #define KeyMap _lib_iv(KeyMap)
-  #define KnownFonts _lib_iv(KnownFonts)
-  #define LRComposition _lib_iv(LRComposition)
-  #define LRMarker _lib_iv(LRMarker)
-***************
-*** 136,198 ****
---- 242,404 ----
-  #define Layout _lib_iv(Layout)
-  #define LayoutKit _lib_iv(LayoutKit)
-  #define LeftMover _lib_iv(LeftMover)
-+ #define Line _lib_iv(Line)
-+ #define LineComp _lib_iv(LineComp)
-+ #define LineObj _lib_iv(LineObj)
-+ #define LineView _lib_iv(LineView)
-+ #define LinkComp _lib_iv(LinkComp)
-+ #define LinkView _lib_iv(LinkView)
-  #define MFDialogKit _lib_iv(MFDialogKit)
-  #define MFKit _lib_iv(MFKit)
-  #define MFKitImpl _lib_iv(MFKitImpl)
-  #define Macro _lib_iv(Macro)
-+ #define MacroActionList _lib_iv(MacroActionList)
-+ #define MacroCmd _lib_iv(MacroCmd)
-+ #define MagnifVar _lib_iv(MagnifVar)
-+ #define MagnifVarView _lib_iv(MagnifVarView)
-+ #define MagnifyTool _lib_iv(MagnifyTool)
-+ #define ManagedWindow _lib_iv(ManagedWindow)
-  #define ManagedWindow _lib_iv(ManagedWindow)
-  #define ManagedWindowHintInfo _lib_iv(ManagedWindowHintInfo)
-  #define ManagedWindowRep _lib_iv(ManagedWindowRep)
-+ #define ManipGroup _lib_iv(ManipGroup)
-+ #define Manipulator _lib_iv(Manipulator)
-  #define MarginFrame _lib_iv(MarginFrame)
-  #define MarginLayout _lib_iv(MarginLayout)
-  #define MatchEditor _lib_iv(MatchEditor)
-+ #define MatchEditor _lib_iv(MatchEditor)
-  #define Menu _lib_iv(Menu)
-  #define MenuBar _lib_iv(MenuBar)
-  #define MenuImpl _lib_iv(MenuImpl)
-  #define MenuItem _lib_iv(MenuItem)
-  #define Message _lib_iv(Message)
-+ #define MobilityCmd _lib_iv(MobilityCmd)
-+ #define MobilityData _lib_iv(MobilityData)
-+ #define ModifStatusVar _lib_iv(ModifStatusVar)
-+ #define ModifStatusVarView _lib_iv(ModifStatusVarView)
-  #define MonoGlyph _lib_iv(MonoGlyph)
-+ #define MonoKit _lib_iv(MonoKit)
-+ #define MonoKitImpl _lib_iv(MonoKitImpl)
-  #define MonoScene _lib_iv(MonoScene)
-+ #define MoveCmd _lib_iv(MoveCmd)
-+ #define MoveData _lib_iv(MoveData)
-+ #define MoveTool _lib_iv(MoveTool)
-  #define Mover _lib_iv(Mover)
-+ #define MultiLine _lib_iv(MultiLine)
-+ #define MultiLineComp _lib_iv(MultiLineComp)
-+ #define MultiLineObj _lib_iv(MultiLineObj)
-+ #define MultiLineView _lib_iv(MultiLineView)
-+ #define NOPCmd _lib_iv(NOPCmd)
-+ #define NameMap _lib_iv(NameMap)
-+ #define NameVar _lib_iv(NameVar)
-+ #define NameVarView _lib_iv(NameVarView)
-  #define NaturalLayout _lib_iv(NaturalLayout)
-+ #define NewCompCmd _lib_iv(NewCompCmd)
-+ #define NormSizeCmd _lib_iv(NormSizeCmd)
-+ #define OLDialogKit _lib_iv(OLDialogKit)
-+ #define OLKit _lib_iv(OLKit)
-+ #define OLKitImpl _lib_iv(OLKitImpl)
-+ #define ObjectMap _lib_iv(ObjectMap)
-+ #define ObjectMapElem _lib_iv(ObjectMapElem)
-  #define Observable _lib_iv(Observable)
-  #define Observer _lib_iv(Observer)
-  #define ObserverList _lib_iv(ObserverList)
-+ #define OpenBSpline _lib_iv(OpenBSpline)
-  #define OptionDesc _lib_iv(OptionDesc)
-+ #define Orientation _lib_iv(Orientation)
-+ #define OrientationCmd _lib_iv(OrientationCmd)
-+ #define PSBrush _lib_iv(PSBrush)
-+ #define PSClosedSpline _lib_iv(PSClosedSpline)
-+ #define PSColor _lib_iv(PSColor)
-+ #define PSEllipse _lib_iv(PSEllipse)
-  #define PSFont _lib_iv(PSFont)
-  #define PSFontImpl _lib_iv(PSFontImpl)
-+ #define PSLine _lib_iv(PSLine)
-+ #define PSLink _lib_iv(PSLink)
-+ #define PSMultiLine _lib_iv(PSMultiLine)
-+ #define PSPad _lib_iv(PSPad)
-+ #define PSPattern _lib_iv(PSPattern)
-+ #define PSPin _lib_iv(PSPin)
-+ #define PSPolygon _lib_iv(PSPolygon)
-+ #define PSRaster _lib_iv(PSRaster)
-+ #define PSRect _lib_iv(PSRect)
-+ #define PSSlot _lib_iv(PSSlot)
-+ #define PSSpline _lib_iv(PSSpline)
-+ #define PSStencil _lib_iv(PSStencil)
-+ #define PSText _lib_iv(PSText)
-+ #define PSVertices _lib_iv(PSVertices)
-+ #define PadComp _lib_iv(PadComp)
-+ #define PadGraphic _lib_iv(PadGraphic)
-+ #define PadView _lib_iv(PadView)
-  #define Page _lib_iv(Page)
-  #define PageInfo_List _lib_iv(PageInfo_List)
-  #define Painter _lib_iv(Painter)
-  #define PainterRep _lib_iv(PainterRep)
-+ #define PanelControl _lib_iv(PanelControl)
-+ #define PanelInteractor _lib_iv(PanelInteractor)
-  #define Panner _lib_iv(Panner)
-+ #define PasteCmd _lib_iv(PasteCmd)
-  #define Patch _lib_iv(Patch)
-+ #define Path _lib_iv(Path)
-  #define PathRenderInfo _lib_iv(PathRenderInfo)
-  #define Pattern _lib_iv(Pattern)
-+ #define PatternCmd _lib_iv(PatternCmd)
-  #define PatternRep _lib_iv(PatternRep)
-+ #define PatternVar _lib_iv(PatternVar)
-+ #define PatternVarView _lib_iv(PatternVarView)
-  #define Perspective _lib_iv(Perspective)
-+ #define Picture _lib_iv(Picture)
-+ #define PinComp _lib_iv(PinComp)
-+ #define PinGraphic _lib_iv(PinGraphic)
-+ #define PinView _lib_iv(PinView)
-+ #define PixelCoord _lib_iv(PixelCoord)
-  #define Placement _lib_iv(Placement)
-+ #define Point _lib_iv(Point)
-+ #define PointObj _lib_iv(PointObj)
-  #define PolyGlyph _lib_iv(PolyGlyph)
-  #define PolyGlyphImpl _lib_iv(PolyGlyphImpl)
-+ #define Polygon _lib_iv(Polygon)
-+ #define PolygonComp _lib_iv(PolygonComp)
-+ #define PolygonView _lib_iv(PolygonView)
-  #define PopupMenu _lib_iv(PopupMenu)
-  #define PopupWindow _lib_iv(PopupWindow)
-+ #define PostScriptView _lib_iv(PostScriptView)
-+ #define PostScriptViews _lib_iv(PostScriptViews)
-+ #define PostorderView _lib_iv(PostorderView)
-+ #define PreorderView _lib_iv(PreorderView)
-+ #define PrintBS _lib_iv(PrintBS)
-+ #define PrintCmd _lib_iv(PrintCmd)
-+ #define PrintDialog _lib_iv(PrintDialog)
-  #define Printer _lib_iv(Printer)
-  #define PrinterRep _lib_iv(PrinterRep)
-  #define PropertyData _lib_iv(PropertyData)
-  #define PulldownMenu _lib_iv(PulldownMenu)
-  #define PullrightMenu _lib_iv(PullrightMenu)
-  #define PushButton _lib_iv(PushButton)
-+ #define QuitCmd _lib_iv(QuitCmd)
-  #define RGBTable _lib_iv(RGBTable)
-  #define RadioButton _lib_iv(RadioButton)
-  #define Raster _lib_iv(Raster)
-+ #define RasterComp _lib_iv(RasterComp)
-+ #define RasterRect _lib_iv(RasterRect)
-  #define RasterRep _lib_iv(RasterRep)
-+ #define RasterView _lib_iv(RasterView)
-+ #define RectComp _lib_iv(RectComp)
-+ #define RectView _lib_iv(RectView)
-+ #define RedToFitCmd _lib_iv(RedToFitCmd)
-+ #define RedoCmd _lib_iv(RedoCmd)
-  #define Reducer _lib_iv(Reducer)
-  #define Regexp _lib_iv(Regexp)
-+ #define ReplaceCmd _lib_iv(ReplaceCmd)
-  #define ReqErr _lib_iv(ReqErr)
-  #define Requirement _lib_iv(Requirement)
-  #define Requisition _lib_iv(Requisition)
-+ #define ReshapeTool _lib_iv(ReshapeTool)
-  #define Resource _lib_iv(Resource)
-+ #define RevertCmd _lib_iv(RevertCmd)
-  #define RightMover _lib_iv(RightMover)
-+ #define RotateCmd _lib_iv(RotateCmd)
-+ #define RotateTool _lib_iv(RotateTool)
-  #define RotatingLine _lib_iv(RotatingLine)
-  #define RotatingLineList _lib_iv(RotatingLineList)
-  #define RotatingRect _lib_iv(RotatingRect)
-***************
-*** 211,218 ****
---- 417,444 ----
-  #define RubberVertex _lib_iv(RubberVertex)
-  #define Rubberband _lib_iv(Rubberband)
-  #define Rule _lib_iv(Rule)
-+ #define SFH_ClosedBSpline _lib_iv(SFH_ClosedBSpline)
-+ #define SFH_OpenBSpline _lib_iv(SFH_OpenBSpline)
-+ #define SF_Circle _lib_iv(SF_Circle)
-+ #define SF_ClosedBSpline _lib_iv(SF_ClosedBSpline)
-+ #define SF_Ellipse _lib_iv(SF_Ellipse)
-+ #define SF_MultiLine _lib_iv(SF_MultiLine)
-+ #define SF_OpenBSpline _lib_iv(SF_OpenBSpline)
-+ #define SF_Polygon _lib_iv(SF_Polygon)
-+ #define SF_Rect _lib_iv(SF_Rect)
-  #define SMFKit _lib_iv(SMFKit)
-  #define SMFKitImpl _lib_iv(SMFKitImpl)
-+ #define S_Circle _lib_iv(S_Circle)
-+ #define S_ClosedBSpline _lib_iv(S_ClosedBSpline)
-+ #define S_Ellipse _lib_iv(S_Ellipse)
-+ #define S_MultiLine _lib_iv(S_MultiLine)
-+ #define S_OpenBSpline _lib_iv(S_OpenBSpline)
-+ #define S_Polygon _lib_iv(S_Polygon)
-+ #define S_Rect _lib_iv(S_Rect)
-+ #define SaveCompAsCmd _lib_iv(SaveCompAsCmd)
-+ #define SaveCompCmd _lib_iv(SaveCompCmd)
-+ #define ScaleCmd _lib_iv(ScaleCmd)
-+ #define ScaleTool _lib_iv(ScaleTool)
-  #define ScalingLine _lib_iv(ScalingLine)
-  #define ScalingLineList _lib_iv(ScalingLineList)
-  #define ScalingRect _lib_iv(ScalingRect)
-***************
-*** 220,225 ****
---- 446,453 ----
-  #define ScrollBar _lib_iv(ScrollBar)
-  #define ScrollBox _lib_iv(ScrollBox)
-  #define Scroller _lib_iv(Scroller)
-+ #define SelectTool _lib_iv(SelectTool)
-+ #define Selection _lib_iv(Selection)
-  #define SelectionHandler _lib_iv(SelectionHandler)
-  #define SelectionList _lib_iv(SelectionList)
-  #define SelectionManager _lib_iv(SelectionManager)
-***************
-*** 232,247 ****
---- 460,488 ----
-  #define Shape _lib_iv(Shape)
-  #define ShowFrame _lib_iv(ShowFrame)
-  #define SimpleCompositor _lib_iv(SimpleCompositor)
-+ #define SlctAllCmd _lib_iv(SlctAllCmd)
-  #define Slider _lib_iv(Slider)
-  #define SliderImpl _lib_iv(SliderImpl)
-  #define SlidingEllipse _lib_iv(SlidingEllipse)
-  #define SlidingLine _lib_iv(SlidingLine)
-  #define SlidingLineList _lib_iv(SlidingLineList)
-+ #define SlidingPin _lib_iv(SlidingPin)
-  #define SlidingPointList _lib_iv(SlidingPointList)
-  #define SlidingRect _lib_iv(SlidingRect)
-+ #define SlotComp _lib_iv(SlotComp)
-+ #define SlotGraphic _lib_iv(SlotGraphic)
-+ #define SlotView _lib_iv(SlotView)
-+ #define SplineComp _lib_iv(SplineComp)
-+ #define SplineView _lib_iv(SplineView)
-+ #define State _lib_iv(State)
-+ #define StateVar _lib_iv(StateVar)
-+ #define StateVarView _lib_iv(StateVarView)
-  #define Stencil _lib_iv(Stencil)
-+ #define StencilComp _lib_iv(StencilComp)
-+ #define StencilView _lib_iv(StencilView)
-  #define Stepper _lib_iv(Stepper)
-  #define StepperSubclassName _lib_iv(StepperSubclassName)
-+ #define StretchTool _lib_iv(StretchTool)
-  #define StretchingRect _lib_iv(StretchingRect)
-  #define StringBrowser _lib_iv(StringBrowser)
-  #define StringChooser _lib_iv(StringChooser)
-***************
-*** 254,259 ****
---- 495,502 ----
-  #define TBComposition _lib_iv(TBComposition)
-  #define TBScrollBox _lib_iv(TBScrollBox)
-  #define TBScrollBoxImpl _lib_iv(TBScrollBoxImpl)
-+ #define TF_2Port _lib_iv(TF_2Port)
-+ #define TF_Direct _lib_iv(TF_Direct)
-  #define TGlue _lib_iv(TGlue)
-  #define TIFFRaster _lib_iv(TIFFRaster)
-  #define TSolver _lib_iv(TSolver)
-***************
-*** 263,278 ****
---- 506,529 ----
-  #define TelltaleGroup _lib_iv(TelltaleGroup)
-  #define TelltaleState _lib_iv(TelltaleState)
-  #define TextBuffer _lib_iv(TextBuffer)
-+ #define TextBuffer _lib_iv(TextBuffer)
-  #define TextButton _lib_iv(TextButton)
-+ #define TextComp _lib_iv(TextComp)
-  #define TextDisplay _lib_iv(TextDisplay)
-  #define TextEditor _lib_iv(TextEditor)
-+ #define TextGraphic _lib_iv(TextGraphic)
-+ #define TextInteractor _lib_iv(TextInteractor)
-+ #define TextManip _lib_iv(TextManip)
-  #define TextRenderInfo _lib_iv(TextRenderInfo)
-+ #define TextView _lib_iv(TextView)
-  #define Tile _lib_iv(Tile)
-  #define TileFirstAligned _lib_iv(TileFirstAligned)
-  #define TileReversed _lib_iv(TileReversed)
-  #define TileReversedFirstAligned _lib_iv(TileReversedFirstAligned)
-  #define TitleFrame _lib_iv(TitleFrame)
-+ #define Tool _lib_iv(Tool)
-  #define TopLevelWindow _lib_iv(TopLevelWindow)
-+ #define TransferFunct _lib_iv(TransferFunct)
-  #define TransformFitter _lib_iv(TransformFitter)
-  #define TransformSetter _lib_iv(TransformSetter)
-  #define Transformer _lib_iv(Transformer)
-***************
-*** 280,304 ****
---- 531,585 ----
-  #define TransientWindow _lib_iv(TransientWindow)
-  #define Tray _lib_iv(Tray)
-  #define TrayElement _lib_iv(TrayElement)
-+ #define UArray _lib_iv(UArray)
-+ #define UChooser _lib_iv(UChooser)
-+ #define UControl _lib_iv(UControl)
-+ #define UControlInteractor _lib_iv(UControlInteractor)
-+ #define UHashElem _lib_iv(UHashElem)
-+ #define UHashTable _lib_iv(UHashTable)
-+ #define ULabel _lib_iv(ULabel)
-+ #define UList _lib_iv(UList)
-+ #define UMap _lib_iv(UMap)
-+ #define UMapElem _lib_iv(UMapElem)
-+ #define UPage _lib_iv(UPage)
-+ #define UStencil _lib_iv(UStencil)
-+ #define UndoCmd _lib_iv(UndoCmd)
-+ #define UngroupCmd _lib_iv(UngroupCmd)
-+ #define Unidraw _lib_iv(Unidraw)
-  #define UpMover _lib_iv(UpMover)
-  #define VBorder _lib_iv(VBorder)
-  #define VBox _lib_iv(VBox)
-  #define VGlue _lib_iv(VGlue)
-+ #define VPanelControl _lib_iv(VPanelControl)
-  #define VRule _lib_iv(VRule)
-  #define VScrollBar _lib_iv(VScrollBar)
-  #define VScroller _lib_iv(VScroller)
-+ #define VSlotComp _lib_iv(VSlotComp)
-+ #define VSlotView _lib_iv(VSlotView)
-  #define VariableLayout _lib_iv(VariableLayout)
-+ #define VertexManip _lib_iv(VertexManip)
-+ #define Vertices _lib_iv(Vertices)
-+ #define VerticesComp _lib_iv(VerticesComp)
-+ #define VerticesView _lib_iv(VerticesView)
-+ #define ViewCompCmd _lib_iv(ViewCompCmd)
-  #define ViewList _lib_iv(ViewList)
-+ #define Viewer _lib_iv(Viewer)
-+ #define ViewerView _lib_iv(ViewerView)
-  #define Viewport _lib_iv(Viewport)
-+ #define VoidData _lib_iv(VoidData)
-  #define WidgetKit _lib_iv(WidgetKit)
-  #define WidgetKitImpl _lib_iv(WidgetKitImpl)
-  #define Window _lib_iv(Window)
-+ #define WindowCursorStack _lib_iv(WindowCursorStack)
-  #define WindowRep _lib_iv(WindowRep)
-  #define WindowTable _lib_iv(WindowTable)
-  #define WindowVisual _lib_iv(WindowVisual)
-  #define World _lib_iv(World)
-+ #define XDisplay _lib_iv(XDisplay)
-+ #define XDrag _lib_iv(XDrag)
-  #define XSlider _lib_iv(XSlider)
-  #define XYMarker _lib_iv(XYMarker)
-  #define XYSlider _lib_iv(XYSlider)
-  #define YSlider _lib_iv(YSlider)
-  #define Zoomer _lib_iv(Zoomer)
-+ #define Zooming _lib_iv(Zooming)
-diff -rc --exclude=Makefile --exclude=FREEBSD work-orig/iv/src/include/InterViews/_names.h ./src/include/InterViews/_names.h
-*** work-orig/iv/src/include/InterViews/_names.h	Fri Mar 20 07:46:49 1992
---- ./src/include/InterViews/_names.h	Mon May 29 19:23:56 1995
-***************
-*** 36,41 ****
---- 36,48 ----
-  #undef Coord
-  #undef Deck
-  #undef Dialog
-+ #undef RasterRect
-+ #undef Point
-+ #undef Line
-+ #undef Ellipse
-+ #undef MultiLine
-+ #undef Polygon
-+ #undef ClosedBSpline
-  #undef FileBrowser
-  #undef FileChooser
-  #undef Glue
-***************
-*** 68,73 ****
---- 75,87 ----
-  #define Coord _lib_iv(Coord)
-  #define Deck _lib_iv(Deck)
-  #define Dialog _lib_iv(Dialog)
-+ #define RasterRect _lib_iv(RasterRect)
-+ #define Point _lib_iv(Point)
-+ #define Line _lib_iv(Line)
-+ #define Ellipse _lib_iv(Ellipse)
-+ #define MultiLine _lib_iv(MultiLine)
-+ #define Polygon _lib_iv(Polygon)
-+ #define ClosedBSpline _lib_iv(ClosedBSpline)
-  #define FileBrowser _lib_iv(FileBrowser)
-  #define FileChooser _lib_iv(FileChooser)
-  #define Glue _lib_iv(Glue)
-diff -rc --exclude=Makefile --exclude=FREEBSD work-orig/iv/src/include/InterViews/_undefs.h ./src/include/InterViews/_undefs.h
-*** work-orig/iv/src/include/InterViews/_undefs.h	Wed May 13 06:29:09 1992
---- ./src/include/InterViews/_undefs.h	Mon May 29 18:15:36 1995
-***************
-*** 65,70 ****
---- 65,71 ----
-  #undef Compositor
-  #undef Control
-  #undef ControlState
-+ #undef CoordinateSpace
-  #undef Cursor
-  #undef CursorRep
-  #undef CursorRepBitmap
-***************
-*** 76,84 ****
---- 77,92 ----
-  #undef Deck
-  #undef Dialog
-  #undef DialogKit
-+ #undef DialogKitImpl
-  #undef Display
-  #undef DisplayRep
-  #undef DownMover
-+ #undef Drag
-+ #undef DragRep
-+ #undef DragZone
-+ #undef DragZoneRep
-+ #undef DragZoneSink
-+ #undef DragZoneSinkHandler
-  #undef Enlarger
-  #undef Event
-  #undef EventRep
-***************
-*** 140,145 ****
---- 148,154 ----
-  #undef MFKit
-  #undef MFKitImpl
-  #undef Macro
-+ #undef MacroActionList
-  #undef ManagedWindow
-  #undef ManagedWindowHintInfo
-  #undef ManagedWindowRep
-***************
-*** 152,160 ****
---- 161,174 ----
-  #undef MenuItem
-  #undef Message
-  #undef MonoGlyph
-+ #undef MonoKit
-+ #undef MonoKitImpl
-  #undef MonoScene
-  #undef Mover
-  #undef NaturalLayout
-+ #undef OLDialogKit
-+ #undef OLKit
-+ #undef OLKitImpl
-  #undef Observable
-  #undef Observer
-  #undef ObserverList
-***************
-*** 293,302 ****
---- 307,319 ----
-  #undef WidgetKit
-  #undef WidgetKitImpl
-  #undef Window
-+ #undef WindowCursorStack
-  #undef WindowRep
-  #undef WindowTable
-  #undef WindowVisual
-  #undef World
-+ #undef XDisplay
-+ #undef XDrag
-  #undef XSlider
-  #undef XYMarker
-  #undef XYSlider
-diff -rc --exclude=Makefile --exclude=FREEBSD work-orig/iv/src/include/Unidraw/_defines.h ./src/include/Unidraw/_defines.h
-*** work-orig/iv/src/include/Unidraw/_defines.h	Sat Oct 31 09:52:35 1992
---- ./src/include/Unidraw/_defines.h	Mon May 29 18:34:17 1995
-***************
-*** 156,162 ****
-  #define PadComp _lib_iv(PadComp)
-  #define PadGraphic _lib_iv(PadGraphic)
-  #define PadView _lib_iv(PadView)
-- #define Page _lib_iv(Page)
-  #define PanelControl _lib_iv(PanelControl)
-  #define PanelInteractor _lib_iv(PanelInteractor)
-  #define PasteCmd _lib_iv(PasteCmd)
---- 156,161 ----
-diff -rc --exclude=Makefile --exclude=FREEBSD work-orig/iv/src/include/Unidraw/_undefs.h ./src/include/Unidraw/_undefs.h
-*** work-orig/iv/src/include/Unidraw/_undefs.h	Sat Oct 31 09:52:35 1992
---- ./src/include/Unidraw/_undefs.h	Mon May 29 18:34:17 1995
-***************
-*** 156,162 ****
-  #undef PadComp
-  #undef PadGraphic
-  #undef PadView
-- #undef Page
-  #undef PanelControl
-  #undef PanelInteractor
-  #undef PasteCmd
---- 156,161 ----
-diff -rc --exclude=Makefile --exclude=FREEBSD work-orig/iv/src/lib/IV-2_6/painter.c ./src/lib/IV-2_6/painter.c
-*** work-orig/iv/src/lib/IV-2_6/painter.c	Wed Feb 12 07:19:44 1992
---- ./src/lib/IV-2_6/painter.c	Mon May 29 15:01:27 1995
-***************
-*** 39,44 ****
---- 39,47 ----
-  #include <stdlib.h>
-  #include <string.h>
-  
-+ #include <InterViews/_names.h>
-+ #include <InterViews/_enter.h>
-+ 
-  /*
-   * For reasons of caching, it is important that the attributes
-   * are set to nil (or 0) before being set to their default values.
-diff -rc --exclude=Makefile --exclude=FREEBSD work-orig/iv/src/lib/IV-2_6/xpainter.c ./src/lib/IV-2_6/xpainter.c
-*** work-orig/iv/src/lib/IV-2_6/xpainter.c	Tue Oct 20 06:02:42 1992
---- ./src/lib/IV-2_6/xpainter.c	Mon May 29 19:19:13 1995
-***************
-*** 56,61 ****
---- 56,62 ----
-  #include <OS/math.h>
-  #include <OS/string.h>
-  #include <OS/table2.h>
-+ #include <InterViews/_names.h>
-  
-  PainterRep::PainterRep() {
-      display = Session::instance()->default_display();
-***************
-*** 1231,1237 ****
-  	return;
-      }
-      register XPoint* v = AllocPts(n+1);
-!     for (register int i = 0; i < n; i++) {
-  	Map(c, x[i], y[i], v[i].x, v[i].y);
-      }
-      if (x[i-1] != x[0] || y[i-1] != y[0]) {
---- 1232,1239 ----
-  	return;
-      }
-      register XPoint* v = AllocPts(n+1);
-!     register int i;
-!     for (i = 0; i < n; i++) {
-  	Map(c, x[i], y[i], v[i].x, v[i].y);
-      }
-      if (x[i-1] != x[0] || y[i-1] != y[0]) {
-diff -rc --exclude=Makefile --exclude=FREEBSD work-orig/iv/src/lib/TIFF/prototypes.h ./src/lib/TIFF/prototypes.h
-*** work-orig/iv/src/lib/TIFF/prototypes.h	Wed May 31 08:52:12 1995
---- ./src/lib/TIFF/prototypes.h	Sun May 28 14:21:04 1995
-***************
-*** 25,31 ****
-   */
-  
-  #if USE_PROTOTYPES
-- va_dcl
-  #define	DECLARE1(f,t1,a1)		f(t1 a1)
-  #define	DECLARE2(f,t1,a1,t2,a2)		f(t1 a1, t2 a2)
-  #define	DECLARE3(f,t1,a1,t2,a2,t3,a3)	f(t1 a1, t2 a2, t3 a3)
---- 25,30 ----
-diff -rc --exclude=Makefile --exclude=FREEBSD work-orig/iv/src/lib/TIFF/tif_aux.c ./src/lib/TIFF/tif_aux.c
-*** work-orig/iv/src/lib/TIFF/tif_aux.c	Sat Mar 28 08:23:06 1992
---- ./src/lib/TIFF/tif_aux.c	Sun May 28 14:15:50 1995
-***************
-*** 42,47 ****
---- 42,49 ----
-   *	explcit values so that defaults exist only one
-   *	place in the library -- in TIFFDefaultDirectory.
-   */
-+  ;
-+  /* for some reason it needs a ; before this line */
-  TIFFVGetFieldDefaulted(tif, tag, ap)
-  	TIFF *tif;
-  	int tag;
-diff -rc --exclude=Makefile --exclude=FREEBSD work-orig/iv/src/lib/TIFF/tif_dir.c ./src/lib/TIFF/tif_dir.c
-*** work-orig/iv/src/lib/TIFF/tif_dir.c	Sat Mar  7 06:29:51 1992
---- ./src/lib/TIFF/tif_dir.c	Sun May 28 13:00:03 1995
-***************
-*** 950,956 ****
-  		}
-  		if (tif->tif_flags & TIFF_SWAB)
-  			TIFFSwabShort(&dircount);
-! 		lseek(tif->tif_fd, dircount*sizeof (TIFFDirEntry), L_INCR);
-  		if (!ReadOK(tif->tif_fd, &nextdir, sizeof (nextdir))) {
-  			TIFFError(module, "%s: Error fetching directory link",
-  			    tif->tif_name);
---- 950,957 ----
-  		}
-  		if (tif->tif_flags & TIFF_SWAB)
-  			TIFFSwabShort(&dircount);
-! 		/*added (off_t) .. jj@ldjpc.apana.org.au*/
-! 		lseek(tif->tif_fd, (off_t)(dircount*sizeof (TIFFDirEntry)), L_INCR);
-  		if (!ReadOK(tif->tif_fd, &nextdir, sizeof (nextdir))) {
-  			TIFFError(module, "%s: Error fetching directory link",
-  			    tif->tif_name);
-diff -rc --exclude=Makefile --exclude=FREEBSD work-orig/iv/src/lib/TIFF/tif_dirwrite.c ./src/lib/TIFF/tif_dirwrite.c
-*** work-orig/iv/src/lib/TIFF/tif_dirwrite.c	Wed Mar 18 05:39:29 1992
---- ./src/lib/TIFF/tif_dirwrite.c	Sun May 28 12:57:11 1995
-***************
-*** 177,183 ****
-  	dataoff = tif->tif_diroff + sizeof (short) + dirsize + sizeof (long);
-  	if (dataoff & 1)
-  		dataoff++;
-! 	(void) lseek(tif->tif_fd, dataoff, L_SET);
-  	tif->tif_curdir++;
-  	dir = (TIFFDirEntry *)data;
-  	/*
---- 177,184 ----
-  	dataoff = tif->tif_diroff + sizeof (short) + dirsize + sizeof (long);
-  	if (dataoff & 1)
-  		dataoff++;
-! 	/* added (off_t) below.....jj@ldjpc.apana.org.au*/
-! 	(void) lseek(tif->tif_fd, (off_t)(dataoff), L_SET);
-  	tif->tif_curdir++;
-  	dir = (TIFFDirEntry *)data;
-  	/*
-***************
-*** 314,320 ****
-  	/*
-  	 * Write directory.
-  	 */
-! 	(void) lseek(tif->tif_fd, tif->tif_diroff, L_SET);
-  	dircount = nfields;
-  	if (!WriteOK(tif->tif_fd, &dircount, sizeof (short))) {
-  		TIFFError(tif->tif_name, "Error writing directory count");
---- 315,322 ----
-  	/*
-  	 * Write directory.
-  	 */
-! 	/*added (off_t) below.....jj@ldjpc.apana.org.au*/
-! 	(void) lseek(tif->tif_fd, (off_t)(tif->tif_diroff), L_SET);
-  	dircount = nfields;
-  	if (!WriteOK(tif->tif_fd, &dircount, sizeof (short))) {
-  		TIFFError(tif->tif_name, "Error writing directory count");
-***************
-*** 762,774 ****
-  	u_short dircount;
-  	long nextdir;
-  
-! 	tif->tif_diroff = (lseek(tif->tif_fd, 0L, L_XTND)+1) &~ 1L;
-  	if (tif->tif_header.tiff_diroff == 0) {
-  		/*
-  		 * First directory, overwrite header.
-  		 */
-  		tif->tif_header.tiff_diroff = tif->tif_diroff;
-! 		(void) lseek(tif->tif_fd, 0L, L_SET);
-  		if (!WriteOK(tif->tif_fd, &tif->tif_header,
-  		    sizeof (tif->tif_header))) {
-  			TIFFError(tif->tif_name, "Error writing TIFF header");
---- 764,778 ----
-  	u_short dircount;
-  	long nextdir;
-  
-! 	/* changed 0L to (off_t)0 below...jj@ldjpc.apana.org.au*/
-! 	tif->tif_diroff = (lseek(tif->tif_fd, (off_t)0, L_XTND)+1) &~ 1L;
-  	if (tif->tif_header.tiff_diroff == 0) {
-  		/*
-  		 * First directory, overwrite header.
-  		 */
-  		tif->tif_header.tiff_diroff = tif->tif_diroff;
-! 		/* changed 0L to (off_t)0 .. jj@ldjpc.apana.org.au*/
-! 		(void) lseek(tif->tif_fd, (off_t)0, L_SET);
-  		if (!WriteOK(tif->tif_fd, &tif->tif_header,
-  		    sizeof (tif->tif_header))) {
-  			TIFFError(tif->tif_name, "Error writing TIFF header");
-***************
-*** 788,794 ****
-  		}
-  		if (tif->tif_flags & TIFF_SWAB)
-  			TIFFSwabShort(&dircount);
-! 		lseek(tif->tif_fd, dircount * sizeof (TIFFDirEntry), L_INCR);
-  		if (!ReadOK(tif->tif_fd, &nextdir, sizeof (nextdir))) {
-  			TIFFError(module, "Error fetching directory link");
-  			return (0);
---- 792,799 ----
-  		}
-  		if (tif->tif_flags & TIFF_SWAB)
-  			TIFFSwabShort(&dircount);
-! 		/*added (off_t) below....jj@ldjpc.apana.org.au*/
-! 		lseek(tif->tif_fd, (off_t)(dircount * sizeof (TIFFDirEntry)), L_INCR);
-  		if (!ReadOK(tif->tif_fd, &nextdir, sizeof (nextdir))) {
-  			TIFFError(module, "Error fetching directory link");
-  			return (0);
-***************
-*** 796,802 ****
-  		if (tif->tif_flags & TIFF_SWAB)
-  			TIFFSwabLong((u_long *)&nextdir);
-  	} while (nextdir != 0);
-! 	(void) lseek(tif->tif_fd, -sizeof (nextdir), L_INCR);
-  	if (!WriteOK(tif->tif_fd, &tif->tif_diroff, sizeof (tif->tif_diroff))) {
-  		TIFFError(module, "Error writing directory link");
-  		return (0);
---- 801,808 ----
-  		if (tif->tif_flags & TIFF_SWAB)
-  			TIFFSwabLong((u_long *)&nextdir);
-  	} while (nextdir != 0);
-! 	/*added (off_t) below ... jj@ldjpc.apana.org.au*/
-! 	(void) lseek(tif->tif_fd, (off_t)(-sizeof (nextdir)), L_INCR);
-  	if (!WriteOK(tif->tif_fd, &tif->tif_diroff, sizeof (tif->tif_diroff))) {
-  		TIFFError(module, "Error writing directory link");
-  		return (0);
-diff -rc --exclude=Makefile --exclude=FREEBSD work-orig/iv/src/lib/TIFF/tif_write.c ./src/lib/TIFF/tif_write.c
-*** work-orig/iv/src/lib/TIFF/tif_write.c	Tue Feb 11 13:36:47 1992
---- ./src/lib/TIFF/tif_write.c	Sun May 28 12:57:57 1995
-***************
-*** 550,556 ****
-  			}
-  		} else
-  			td->td_stripoffset[strip] =
-! 			    lseek(tif->tif_fd, 0L, L_XTND);
-  		tif->tif_curoff = td->td_stripoffset[strip];
-  	}
-  	if (!WriteOK(tif->tif_fd, data, cc)) {
---- 550,557 ----
-  			}
-  		} else
-  			td->td_stripoffset[strip] =
-! 			    /*changed 0L to (off_t)0 .. jj@ldjpc.apana.org.au*/
-! 			    lseek(tif->tif_fd, (off_t)0, L_XTND);
-  		tif->tif_curoff = td->td_stripoffset[strip];
-  	}
-  	if (!WriteOK(tif->tif_fd, data, cc)) {
-diff -rc --exclude=Makefile --exclude=FREEBSD work-orig/iv/src/lib/TIFF/tiffcompat.h ./src/lib/TIFF/tiffcompat.h
-*** work-orig/iv/src/lib/TIFF/tiffcompat.h	Tue Mar 31 12:01:04 1992
---- ./src/lib/TIFF/tiffcompat.h	Sun May 28 14:13:59 1995
-***************
-*** 154,160 ****
-  #define	lseek	mpw_lseek
-  extern long mpw_lseek(int, long, int);
-  #else
-! extern	long lseek();
-  #endif
-  
-  /*
---- 154,161 ----
-  #define	lseek	mpw_lseek
-  extern long mpw_lseek(int, long, int);
-  #else
-! /*changed to the correct one...jj@ldjpc.apana.org.au*/
-! extern	off_t lseek();
-  #endif
-  
-  /*
-***************
-*** 163,170 ****
-  #ifndef ReadOK
-  #define	ReadOK(fd, buf, size)	(read(fd, (char *)buf, size) == size)
-  #endif
-  #ifndef SeekOK
-! #define	SeekOK(fd, off)	(lseek(fd, (long)off, L_SET) == (long)off)
-  #endif
-  #ifndef WriteOK
-  #define	WriteOK(fd, buf, size)	(write(fd, (char *)buf, size) == size)
---- 164,172 ----
-  #ifndef ReadOK
-  #define	ReadOK(fd, buf, size)	(read(fd, (char *)buf, size) == size)
-  #endif
-+ /*changed (long) to (off_t) to compile....jj@ldjpc.apana.org.au*/
-  #ifndef SeekOK
-! #define	SeekOK(fd, off)	(lseek(fd, (off_t)off, L_SET) == (off_t)off)
-  #endif
-  #ifndef WriteOK
-  #define	WriteOK(fd, buf, size)	(write(fd, (char *)buf, size) == size)
-***************
-*** 202,211 ****
-   */
-  #if defined(__STDC__) && !defined(USE_VARARGS)
-  #define	USE_VARARGS	0
-  #endif
-  
-  #if defined(USE_VARARGS)
-! #if USE_VARARGS
-  #include <varargs.h>
-  #define	VA_START(ap, parmN)	va_start(ap)
-  #else
---- 204,218 ----
-   */
-  #if defined(__STDC__) && !defined(USE_VARARGS)
-  #define	USE_VARARGS	0
-+ #else 
-+ #if defined(__FreeBSD__)
-+ #undef USE_VARARGS
-+ #define USE_VARARGS     0
-+ #endif
-  #endif
-  
-  #if defined(USE_VARARGS)
-! #if USE_VARARGS && !defined(__FreeBSD__)
-  #include <varargs.h>
-  #define	VA_START(ap, parmN)	va_start(ap)
-  #else
diff --git a/japanese/iv/files/patch-ae b/japanese/iv/files/patch-ae
deleted file mode 100644
index 37d98d34bf5b..000000000000
--- a/japanese/iv/files/patch-ae
+++ /dev/null
@@ -1,27 +0,0 @@
---- src/lib/IV/Imakefile.orig	Wed Oct  7 13:46:44 1998
-+++ src/lib/IV/Imakefile	Wed Oct  7 15:57:25 1998
-@@ -18,11 +18,6 @@
-     $(DISPATCH)/iohandler.$(CCSUFFIX)
- #endif
- 
--#ifdef SharedCCFlags
--#undef SharedCCFlags
--#define SharedCCFlags -PIC
--#endif
--
- INTERVIEWS = $(SRC)/../InterViews
- IV_2_6	   = $(SRC)/../IV-2_6
- IV_X11	   = $(SRC)/../IV-X11
-@@ -37,7 +32,11 @@
- 	$(OS)$(SLASH)*.$(CCSUFFIX)
- 	/* TIFF not included because it can't use the same flags */
- LIB	   = IV
--VERSION	   = 3.1
-+.if defined(PORTOBJFORMAT) && ($(PORTOBJFORMAT) == "elf")
-+VERSION	   = 3
-+.else
-+VERSION    = 3.1
-+.endif
- 
- KIT_CCFLAGS = KitFlags
- LIBPATHS   = -DIV_LIBALL='"$(ABSLIBALLDIR)"' -DX_LIBDIR='"$(XLIBDIR)"'
diff --git a/japanese/iv/files/patch-af b/japanese/iv/files/patch-af
deleted file mode 100644
index 832602bfa7d8..000000000000
--- a/japanese/iv/files/patch-af
+++ /dev/null
@@ -1,33 +0,0 @@
-*** src/lib/InterViews/style.c.orig	Wed Jan 17 10:36:19 1996
---- src/lib/InterViews/style.c	Mon Jan  3 13:49:46 2000
-***************
-*** 41,47 ****
---- 41,51 ----
-  #include <OS/ustring.h>
-  #include <ctype.h>
-  #ifdef JIV
-+ #ifdef __STDC__
-+ #include <stdio.h>
-+ #else
-  #include <libc.h>
-+ #endif
-  #endif /* JIV */
-  
-  declarePtrList(StyleList,Style)
-***************
-*** 427,433 ****
-  	for (long i = 0; i < e->avail_; i++) {
-  	    new_list[i] = e->entries_[i];
-  	}
-! 	for (i = e->avail_; i < new_avail; i++) {
-  	    new_list[i] = nil;
-  	}
-  	delete e->entries_;
---- 431,437 ----
-  	for (long i = 0; i < e->avail_; i++) {
-  	    new_list[i] = e->entries_[i];
-  	}
-! 	for (int i = e->avail_; i < new_avail; i++) {
-  	    new_list[i] = nil;
-  	}
-  	delete e->entries_;
diff --git a/japanese/iv/files/patch-ag b/japanese/iv/files/patch-ag
deleted file mode 100644
index 60eaa9d32923..000000000000
--- a/japanese/iv/files/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-*** src/lib/IV-X11/kinput.c.orig	Wed Jan 17 10:36:10 1996
---- src/lib/IV-X11/kinput.c	Wed Jan 17 18:50:42 1996
-***************
-*** 29,34 ****
---- 29,36 ----
-  
-  #include <stdio.h>
-  
-+ #include <InterViews/display.h>
-+ 
-  #include <IV-X11/Xlib.h>
-  #include <IV-X11/xdisplay.h>
-  
diff --git a/japanese/iv/files/patch-ah b/japanese/iv/files/patch-ah
deleted file mode 100644
index d3aa67c63e13..000000000000
--- a/japanese/iv/files/patch-ah
+++ /dev/null
@@ -1,20 +0,0 @@
-*** src/config/InterViews/local.def.orig	Sat Feb 10 19:56:09 1996
---- src/config/InterViews/local.def	Sat Feb 10 20:05:38 1996
-***************
-*** 60,65 ****
---- 60,74 ----
-   */
-  #undef InstalledRoot
-  #define InstalledRoot /usr/local/interviews
-+ #define BinDir InstalledRoot/bin
-+ #define LibDir InstalledRoot/lib
-+ 
-+ /*
-+  * If we are going to define the above, then, we might as well have it
-+  * take effect. (mrs)
-+  */
-+ #undef InstallRelative
-+ #define InstallRelative               NO      /* need absolute pathnames */
-  
-  /*
-   * If the X11 config files are not in /usr/lib/X11/config, the X11
diff --git a/japanese/iv/files/patch-ai b/japanese/iv/files/patch-ai
deleted file mode 100644
index 4db1c72608e3..000000000000
--- a/japanese/iv/files/patch-ai
+++ /dev/null
@@ -1,39 +0,0 @@
---- src/config/InterViews/rules.def.orig	Fri Sep 25 07:06:33 1992
-+++ src/config/InterViews/rules.def	Wed Oct  7 16:25:41 1998
-@@ -399,6 +399,28 @@
- /*
-  * Make a shared library.
-  */
-+#if defined(FreeBSDArchitecture)
-+#define NormalSunOSSharedLibraryTarget(libname,rev,depobjs,ldobjs)	@@\
-+AOUT = Concat(lib,libname.so.rev)					@@\
-+SHARED_CCFLAGS = SharedCCFlags						@@\
-+									@@\
-+AllTarget(Concat(lib,libname.so.rev))					@@\
-+									@@\
-+Concat(lib,libname.so.rev): depobjs					@@\
-+	@echo "building $@"						@@\
-+	$(RM) $@~							@@\
-+.if $(PORTOBJFORMAT) == "elf"						@@\
-+	$(CC) -shared  -Wl,-soname,Concat(lib,libname.so.rev) -o $@~ ldobjs @@\
-+.else									@@\
-+	$(LD) -o $@~ -Bshareable ldobjs					@@\
-+.endif									@@\
-+	$(RM) $@							@@\
-+	$(MV) $@~ $@							@@\
-+	$(LN) $@ Concat(lib,libname.so)					@@\
-+									@@\
-+clean::									@@\
-+	$(RM) Concat(lib,libname.so.rev)
-+#else
- #ifndef NormalSunOSSharedLibraryTarget
- #if OSMajorVersion < 5
- #define NormalSunOSSharedLibraryTarget(libname,rev,depobjs,ldobjs)	@@\
-@@ -434,6 +456,7 @@
- 									@@\
- clean::									@@\
- 	$(RM) Concat(lib,libname.so.rev)
-+#endif
- #endif
- #endif
- 
diff --git a/japanese/iv/files/patch-aj b/japanese/iv/files/patch-aj
deleted file mode 100644
index caf9f4d27970..000000000000
--- a/japanese/iv/files/patch-aj
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/lib/Unidraw/Imakefile.orig	Sat Oct 31 08:32:58 1992
-+++ src/lib/Unidraw/Imakefile	Wed Oct  7 15:55:02 1998
-@@ -5,7 +5,11 @@
- #ifdef InObjectCodeDir
- 
- LIB = Unidraw
-+.if defined(PORTOBJFORMAT) && ($(PORTOBJFORMAT) == "elf")
-+VERSION = 3
-+.else
- VERSION = 3.1
-+.endif
- 
- MakeLibrary($(LIB),$(VERSION))
- 
diff --git a/japanese/iv/files/patch-bd b/japanese/iv/files/patch-bd
deleted file mode 100644
index 5633bdd684c0..000000000000
--- a/japanese/iv/files/patch-bd
+++ /dev/null
@@ -1,51 +0,0 @@
---- ./src/lib/Unidraw/catalog.c.orig	Sat Dec 12 13:27:55 1992
-+++ ./src/lib/Unidraw/catalog.c	Wed Jul  9 00:00:06 2003
-@@ -57,7 +57,12 @@
- #include <IV-2_6/_enter.h>
- 
- #include <ctype.h>
-+#if __FreeBSD__ >= 2
-+#include <osreldate.h>
-+#if (__FreeBSD_cc_version < 400002 && __FreeBSD_version < 500000)
- #include <osfcn.h>
-+#endif
-+#endif
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-@@ -65,11 +70,13 @@
- #include <strstream.h>
- #ifdef SYSV
- #include <OS/types.h>
-+#endif
-+#if defined(SYSV) || __FreeBSD_cc_version >= 400003 
- #include <unistd.h>
- #endif
- #include <sys/file.h>
- 
--#ifdef __DECCXX
-+#if (defined(__DECCXX) || (__FreeBSD_version > 500000))
- extern "C" {
-     extern int access(char*, int);
-     extern int unlink(char*);
-@@ -1502,7 +1509,8 @@
-             in >> graylevel;
- 
-         } else if (graylevel == nograylevel) {
--            for (int i = 0; in >> buf && i < patternHeight; i++) {
-+	    int i;
-+            for (i = 0; in >> buf && i < patternHeight; i++) {
-                 if (buf[0] == '>' || sscanf(buf, "%x", &data[i]) != 1) {
-                     break;
-                 }
-@@ -1610,8 +1618,9 @@
- 	} else {
- 	    istrstream in(definition, strlen(definition) + 1);
-             int data[patternHeight];
-+	    int i;
- 
--	    for (int i = 0; in >> buf && i < patternHeight; i++) {
-+	    for (i = 0; in >> buf && i < patternHeight; i++) {
- 		if (sscanf(buf, "%x", &data[i]) != 1) {
- 		    break;
- 		}
diff --git a/japanese/iv/files/patch-be b/japanese/iv/files/patch-be
deleted file mode 100644
index f817d5f16cd4..000000000000
--- a/japanese/iv/files/patch-be
+++ /dev/null
@@ -1,15 +0,0 @@
---- ./src/lib/Unidraw/catcmds.c.orig	Tue Jul  8 23:30:56 2003
-+++ ./src/lib/Unidraw/catcmds.c	Wed Jul  9 00:04:05 2003
-@@ -42,7 +42,12 @@
- #include <InterViews/window.h>
- #include <OS/string.h>
- 
-+#if __FreeBSD__ >= 2
-+#include <osreldate.h>
-+#if (__FreeBSD_cc_version < 400002 && __FreeBSD_version < 500000)
- #include <osfcn.h>
-+#endif
-+#endif
- #include <stdio.h>
- #include <stdlib.h>
- #include <stream.h>
diff --git a/japanese/iv/files/patch-bf b/japanese/iv/files/patch-bf
deleted file mode 100644
index 27821508cb62..000000000000
--- a/japanese/iv/files/patch-bf
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/bin/dclock/clocktime.c.orig	Thu May 27 21:32:07 1999
-+++ src/bin/dclock/clocktime.c	Thu May 27 21:33:07 1999
-@@ -55,7 +55,7 @@
- #if defined(hpux) || defined(AIXV3)
-     local = * localtime((time_t*) &gmt.tv_sec);
- #else
--#ifdef __DECCXX
-+#if defined(__DECCXX) || defined(__FreeBSD__)
-     local = * localtime((time_t*)&gmt.tv_sec);
- #else
-     local = * localtime(&gmt.tv_sec);
diff --git a/japanese/iv/files/patch-bg b/japanese/iv/files/patch-bg
deleted file mode 100644
index b86bd7ffa4aa..000000000000
--- a/japanese/iv/files/patch-bg
+++ /dev/null
@@ -1,69 +0,0 @@
---- ./src/bin/ibuild/ibcode.c.orig	Tue Oct 20 02:58:01 1992
-+++ ./src/bin/ibuild/ibcode.c	Wed Jul  9 00:22:23 2003
-@@ -41,11 +41,26 @@
- #include <Unidraw/Graphic/pspaint.h>
- #include <InterViews/shape.h>
- #include <InterViews/transformer.h>
-+
-+#if __FreeBSD__ >= 2
-+#include <osreldate.h>
-+#if (__FreeBSD_cc_version < 400002 && __FreeBSD_version < 500000)
- #include <osfcn.h>
-+#endif
-+#endif
-+#if __FreeBSD_cc_version >= 400003
-+#include <stdio.h>
-+#endif
- #include <stdlib.h>
- #include <stream.h>
- #include <string.h>
- 
-+#if (__FreeBSD_version > 500000)
-+extern "C" {
-+    extern int      sprintf(char * __restrict, const char * __restrict, ...);
-+}
-+#endif
-+
- /*****************************************************************************/
- 
- char* FilterName (const char* name) {
-@@ -362,7 +377,7 @@
- 	ButtonStateVar* bsVar = intcomp->GetButtonStateVar();
- 	const char* bsname = bsVar->GetName();
- 	const char* proc = bsVar->GetFuncName();
--        boolean export = bsVar->GetExport();
-+        boolean getexport = bsVar->GetExport();
-         const char* subclass = bsVar->GetSubclassName();
- 
-         if (!bsVar->IsSubclass() && !_emitMain) {
-@@ -375,7 +390,7 @@
- 	if (!_bsinitslist->Search(bsname)) {
- 	    _bsinitslist->Append(bsname);
- 
--            if (export && !_emitMain) {
-+            if (getexport && !_emitMain) {
-                 out << "    " << bsname;
-             } else {
-                 out << "    " << ButtonClass << "* " << bsname;
-@@ -384,7 +399,7 @@
-             out << bsVar->GetInitial() << ");\n";
- 
-             if (!_emitMain && proc != nil && *proc != '\0') {
--                if (!export || bsVar->IsSubclass()) {
-+                if (!getexport || bsVar->IsSubclass()) {
-                     out << "    " << bsname << "->SetCoreClass(this);\n";
-                     out <<"    "<< bsname<<"->SetCoreFunc("<< "&" << coreclass;
-                     out << "::" << proc << ");\n";
-@@ -1598,10 +1613,10 @@
- void CodeView::BeginInstantiate (ostream& out) {
-     InteractorComp* icomp = GetIntComp();
-     const char* mname = icomp->GetMemberNameVar()->GetName();
--    boolean export = icomp->GetMemberNameVar()->GetExport();
-+    boolean getexport = icomp->GetMemberNameVar()->GetExport();
-     const char* classname = icomp->GetClassNameVar()->GetName();
- 
--    if (export && !_emitMain) {
-+    if (getexport && !_emitMain) {
-         out << "    " << mname << " = new ";
-     } else {
-         out << "    " << classname << "* ";
diff --git a/japanese/iv/files/patch-bh b/japanese/iv/files/patch-bh
deleted file mode 100644
index 2c0e6470c41c..000000000000
--- a/japanese/iv/files/patch-bh
+++ /dev/null
@@ -1,15 +0,0 @@
---- ./src/bin/ibuild/ibdialogs.c.orig	Thu Sep 24 01:43:09 1992
-+++ ./src/bin/ibuild/ibdialogs.c	Wed Jul  9 00:26:21 2003
-@@ -60,7 +60,12 @@
- #include <InterViews/tray.h>
- #include <OS/types.h>
- 
-+#if __FreeBSD__ >= 2
-+#include <osreldate.h>
-+#if (__FreeBSD_cc_version < 400002 && __FreeBSD_version < 500000)
- #include <osfcn.h>
-+#endif
-+#endif
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
diff --git a/japanese/iv/files/patch-bi b/japanese/iv/files/patch-bi
deleted file mode 100644
index 65fc0d878333..000000000000
--- a/japanese/iv/files/patch-bi
+++ /dev/null
@@ -1,26 +0,0 @@
---- src/bin/iclass/direct.c.orig	Sat Dec 12 13:40:42 1992
-+++ src/bin/iclass/direct.c	Wed Jul  9 00:17:58 2003
-@@ -30,13 +30,22 @@
- #include <OS/string.h>
- #include <OS/types.h>
- #include <stddef.h>
-+#if __FreeBSD__ >= 2
-+#include <osreldate.h>
-+#if (__FreeBSD_cc_version < 400002 && __FreeBSD_version < 500000)
- #include <osfcn.h>
-+#endif
-+#endif
- #include <pwd.h>
- #include <string.h>
- #include <stdlib.h>
- #include <sys/stat.h>
- 
--#ifdef __DECCXX
-+#if __FreeBSD_cc_version >= 400003
-+#include <unistd.h>
-+#endif
-+
-+#if (defined(__DECCXX) || (__FreeBSD_version > 500000))
- extern "C" {
-     extern uid_t getuid();
-     extern struct passwd* getpwuid(uid_t);
diff --git a/japanese/iv/files/patch-bj b/japanese/iv/files/patch-bj
deleted file mode 100644
index d814aed0a6fa..000000000000
--- a/japanese/iv/files/patch-bj
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/bin/dclock/data.c.org	Sat Jul 20 04:13:49 1991
-+++ src/bin/dclock/data.c	Mon Jan  3 14:07:07 2000
-@@ -156,7 +156,7 @@
- 	ColonData[1].x[i] = Colon.x[i]+COLx+ColonData[1].y[i]*Slant/width;
-     }
- 
--    for ( i=0; i<12; i++ ) {			// shift, scale, slant A, P, M
-+    for ( int i=0; i<12; i++ ) {			// shift, scale, slant A, P, M
- 	AData.y[i] = (AData.y[i]+0.7)/height + ALLy;
- 	AData.x[i] = (AData.x[i])/width+HTx+AData.y[i]*Slant/width-0.15/width;
- 	PData.y[i] = (PData.y[i]+0.7)/height + ALLy;
diff --git a/japanese/iv/files/patch-bk b/japanese/iv/files/patch-bk
deleted file mode 100644
index c49b76f2d315..000000000000
--- a/japanese/iv/files/patch-bk
+++ /dev/null
@@ -1,72 +0,0 @@
---- src/bin/doc/Document.c.org	Sat Dec 12 08:36:37 1992
-+++ src/bin/doc/Document.c	Mon Jan  3 14:10:55 2000
-@@ -450,7 +450,8 @@
-         return nil;
-     } else {
-         long count = _families->count();
--        for (long i = 0; i < count; ++i) {
-+	long i;
-+        for (i = 0; i < count; ++i) {
-             FontFamilyInfo& info = _families->item_ref(0);
-             if (strcmp(info._name, name) == 0) {
-                 break;
-@@ -590,7 +591,8 @@
- void Document::remove_float (Item* item) {
-     touch(true);
-     long count = _viewer->count();
--    for (long i = 0; i < count; ++i) {
-+    long i;
-+    for (i = 0; i < count; ++i) {
-         DocumentViewerInfo& info = _viewer->item_ref(i);
-         info._viewer->float_removed(item);
-     }
-@@ -2277,7 +2279,8 @@
- 
- long Document::find_macro (const char* name) {
-     long count = _macro->count();
--    for (long i = 0; i < count; ++i) {
-+    long i;
-+    for (i = 0; i < count; ++i) {
-         MacroInfo& info = _macro->item_ref(i);
-         if (strcmp(info._name, name) == 0) {
-             break;
-@@ -2314,7 +2317,8 @@
- 
- long Document::find_counter (const char* name) {
-     long count = _counter->count();
--    for (long i = 0; i < count; ++i) {
-+    long i;
-+    for (i = 0; i < count; ++i) {
-         CounterInfo& info = _counter->item_ref(i);
-         if (strcmp(info._name, name) == 0) {
-             break;
-@@ -2365,7 +2369,8 @@
- 
- long Document::find_parameter (const char* name) {
-     long count = _parameter->count();
--    for (long i = 0; i < count; ++i) {
-+    long i;
-+    for (i = 0; i < count; ++i) {
-         DocumentParameterInfo& info = _parameter->item_ref(i);
-         if (strcmp(info._name, name) == 0) {
-             break;
-@@ -2406,7 +2411,8 @@
- 
- long Document::find_label (const char* name) {
-     long count = _label->count();
--    for (long i = 0; i < count; ++i) {
-+    long i;
-+    for (i = 0; i < count; ++i) {
-         LabelInfo& info = _label->item_ref(i);
-         if (strcmp(info._name, name) == 0) {
-             break;
-@@ -2447,7 +2453,8 @@
- 
- long Document::find_float (Item* item) {
-     long count = _float->count();
--    for (long i = 0; i < count; ++i) {
-+    long i;
-+    for (i = 0; i < count; ++i) {
-         FloatInfo& info = _float->item_ref(i);
-         if (info._item == item) {
-             break;
diff --git a/japanese/iv/files/patch-bl b/japanese/iv/files/patch-bl
deleted file mode 100644
index 7eca01d9d162..000000000000
--- a/japanese/iv/files/patch-bl
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/lib/IV-2_6/control.c.org	Wed Feb 12 05:48:58 1992
-+++ src/lib/IV-2_6/control.c	Mon Jan  3 14:18:03 2000
-@@ -162,7 +162,7 @@
- 	    return true;
- 	}
-     }
--    for (c = state_->Prev(); c != nil; c = c->Prev()) {
-+    for (ControlState* c = state_->Prev(); c != nil; c = c->Prev()) {
- 	if (c->IsView(i)) {
- 	    return true;
- 	}
diff --git a/japanese/iv/files/patch-bm b/japanese/iv/files/patch-bm
deleted file mode 100644
index 8caaca5e8d61..000000000000
--- a/japanese/iv/files/patch-bm
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/bin/dclock/segment.c.org	Tue Mar  5 02:56:58 1991
-+++ src/bin/dclock/segment.c	Mon Jan  3 14:19:39 2000
-@@ -51,7 +51,7 @@
- 	Row[i] |= Row[i]<<16;
- 	seed >>= 4;
-     }
--    for (i = 0; i < 16; i++) {
-+    for (int i = 0; i < 16; i++) {
- 	dat[i] = Row[i%4];
-     }
-     pat = new Pattern(dat);
diff --git a/japanese/iv/files/patch-bn b/japanese/iv/files/patch-bn
deleted file mode 100644
index 8aba3cd8813f..000000000000
--- a/japanese/iv/files/patch-bn
+++ /dev/null
@@ -1,82 +0,0 @@
---- src/bin/doc/DocViewer.c.org	Thu Nov 26 13:46:57 1992
-+++ src/bin/doc/DocViewer.c	Mon Jan  3 14:23:14 2000
-@@ -601,7 +601,8 @@
- 
- void DocumentViewer::pin (const char* name) {
-     long count = _pinned_info->count();
--    for (long i = 0; i < count; ++i) {
-+    long i;
-+    for (i = 0; i < count; ++i) {
-         ViewerPinnedInfo& m = _pinned_info->item_ref(i);
-         if (strcmp(m._name, name) == 0) {
-             break;
-@@ -634,7 +635,8 @@
- 
- void DocumentViewer::unpin (const char* name) {
-     long count = _pinned_info->count();
--    for (long i = 0; i < count; ++i) {
-+    long i;
-+    for (i = 0; i < count; ++i) {
-         ViewerPinnedInfo& m = _pinned_info->item_ref(i);
-         if (strcmp(m._name, name) == 0) {
-             break;
-@@ -652,7 +654,8 @@
- void DocumentViewer::menubar (const char* name) {
-     choose(nil, false);
-     long count = _menu_info->count();
--    for (long i = 0; i < count; ++i) {
-+    long i;
-+    for (i = 0; i < count; ++i) {
-         ViewerMenuInfo& m = _menu_info->item_ref(i);
-         if (strcmp(m._name, name) == 0) {
-             break;
-@@ -675,7 +678,8 @@
- 
- void DocumentViewer::keymap (const char* name) {
-     long count = _keymap_info->count();
--    for (long i = 0; i < count; ++i) {
-+    long i;
-+    for (i = 0; i < count; ++i) {
-         ViewerKeymapInfo& info = _keymap_info->item_ref(i);
-         if (strcmp(info._name, name) == 0) {
-             break;
-@@ -699,7 +703,8 @@
-     const char* name, const Color*& overlay, const Color*& underlay
- ) {
-     long count = _color_info->count();
--    for (long i = 0; i < count; ++i) {
-+    long i;
-+    for (i = 0; i < count; ++i) {
-         ViewerColorInfo& info = _color_info->item_ref(i);
-         if (strcmp(info._name, name) == 0) {
-             break;
-@@ -767,7 +772,8 @@
- 
- void DocumentViewer::float_removed (Item* item) {
-     long count = _float_info->count();
--    for (long i = 0; i < count; ++i) {
-+    long i;
-+    for (i = 0; i < count; ++i) {
-         if (_float_info->item_ref(i)._item == item) {
-             break;
-         }
-@@ -783,7 +789,8 @@
- 
- void DocumentViewer::float_changed (Item* item) {
-     long count = _float_info->count();
--    for (long i = 0; i < count; ++i) {
-+    long i;
-+    for (i = 0; i < count; ++i) {
-         if (_float_info->item_ref(i)._item == item) {
-             break;
-         }
-@@ -798,7 +805,8 @@
- void DocumentViewer::float_adjusted (Item* item, float x, float y, long p) {
-     Session::instance()->default_display()->flush();
-     long count = _float_info->count();
--    for (long i = 0; i < count; ++i) {
-+    long i;
-+    for (i = 0; i < count; ++i) {
-         if (_float_info->item_ref(i)._item == item) {
-             break;
-         }
diff --git a/japanese/iv/files/patch-bo b/japanese/iv/files/patch-bo
deleted file mode 100644
index f9641e4dd41e..000000000000
--- a/japanese/iv/files/patch-bo
+++ /dev/null
@@ -1,38 +0,0 @@
---- src/bin/idraw/idarrow.c.org	Tue Jul 14 02:46:07 1992
-+++ src/bin/idraw/idarrow.c	Mon Jan  3 14:25:47 2000
-@@ -304,9 +304,10 @@
- 	if (dashpatsize <= 0) {
- 	    out << "[] " << dashoffset << " ";
- 	} else {
-+	    int i;
- 	    out << "[";
- 
--	    for (int i = 0; i < dashpatsize - 1; i++) {
-+	    for (i = 0; i < dashpatsize - 1; i++) {
- 		out << dashpat[i] << " ";
- 	    }
- 	    out << dashpat[i] << "] " << dashoffset << " ";
-@@ -557,9 +558,10 @@
- 	if (dashpatsize <= 0) {
- 	    out << "[] " << dashoffset << " ";
- 	} else {
-+	    int i;
- 	    out << "[";
- 
--	    for (int i = 0; i < dashpatsize - 1; i++) {
-+	    for (i = 0; i < dashpatsize - 1; i++) {
- 		out << dashpat[i] << " ";
- 	    }
- 	    out << dashpat[i] << "] " << dashoffset << " ";
-@@ -806,9 +808,10 @@
- 	if (dashpatsize <= 0) {
- 	    out << "[] " << dashoffset << " ";
- 	} else {
-+	    int i;
- 	    out << "[";
- 
--	    for (int i = 0; i < dashpatsize - 1; i++) {
-+	    for (i = 0; i < dashpatsize - 1; i++) {
- 		out << dashpat[i] << " ";
- 	    }
- 	    out << dashpat[i] << "] " << dashoffset << " ";
diff --git a/japanese/iv/files/patch-bp b/japanese/iv/files/patch-bp
deleted file mode 100644
index 4d17ca0c980b..000000000000
--- a/japanese/iv/files/patch-bp
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/bin/mailbox/main.c.org	Sat Sep 12 01:19:22 1992
-+++ src/bin/mailbox/main.c	Mon Jan  3 14:27:04 2000
-@@ -453,7 +453,8 @@
- 	    if (atp != nil) {
- 		char* dotp = strchr(atp, '.');
- 		if (dotp != nil) {
--		    for (int i = 0; i < strlen(mail_domain); ++i) {
-+		    int i;
-+		    for (i = 0; i < strlen(mail_domain); ++i) {
- 			char c = dotp[i];
- 			c = isupper(c) ? c - 'A' + 'a' : c;
- 			if (c != mail_domain[i]) {
diff --git a/japanese/iv/files/patch-bq b/japanese/iv/files/patch-bq
deleted file mode 100644
index fe497312f8fe..000000000000
--- a/japanese/iv/files/patch-bq
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/lib/IV-2_6/matcheditor.c.org	Thu Jun 25 03:30:20 1992
-+++ src/lib/IV-2_6/matcheditor.c	Mon Jan  3 14:32:28 2000
-@@ -53,7 +53,8 @@
- }
- 
- void MatchEditor::Match (const char* p, boolean m) {
--    for (char* pp = pattern; *p != '\0'; ++p, ++pp) {
-+    char* pp;
-+    for (pp = pattern; *p != '\0'; ++p, ++pp) {
-         *pp = *p;
-         if (*p == '%') {
-             ++p;
diff --git a/japanese/iv/files/patch-br b/japanese/iv/files/patch-br
deleted file mode 100644
index 5fdc8bbe2351..000000000000
--- a/japanese/iv/files/patch-br
+++ /dev/null
@@ -1,42 +0,0 @@
---- src/bin/doc/DialogMgr.c.org	Sat Apr 11 14:28:48 1992
-+++ src/bin/doc/DialogMgr.c	Mon Jan  3 14:34:49 2000
-@@ -108,7 +108,8 @@
-     Window* window, const char* prompt, const char* filter
- ) {
-     long count = _chooser->count();
--    for (long i = 0; i < count; ++i) {
-+    long i;
-+    for (i = 0; i < count; ++i) {
-         ChooserInfo& info = _chooser->item_ref(i);
-         if (strcmp(info._prompt, prompt) == 0) {
-             break;
-@@ -128,7 +129,8 @@
-     Window* window, const char* prompt, const char* initial
- ) {
-     long count = _asker->count();
--    for (long i = 0; i < count; ++i) {
-+    long i;
-+    for (i = 0; i < count; ++i) {
-         AskerInfo& info = _asker->item_ref(i);
-         if (strcmp(info._prompt, prompt) == 0) {
-             break;
-@@ -146,7 +148,8 @@
- 
- int DialogManager::confirm (Window* window, const char* prompt) {
-     long count = _confirmer->count();
--    for (long i = 0; i < count; ++i) {
-+    long i;
-+    for (i = 0; i < count; ++i) {
-         ConfirmerInfo& info = _confirmer->item_ref(i);
-         if (strcmp(info._prompt, prompt) == 0) {
-             break;
-@@ -164,7 +167,8 @@
- 
- void DialogManager::report (Window* window, const char* prompt) {
-     long count = _reporter->count();
--    for (long i = 0; i < count; ++i) {
-+    long i;
-+    for (i = 0; i < count; ++i) {
-         ReporterInfo& info = _reporter->item_ref(i);
-         if (strcmp(info._prompt, prompt) == 0) {
-             break;
diff --git a/japanese/iv/files/patch-bs b/japanese/iv/files/patch-bs
deleted file mode 100644
index ae71df5d2d66..000000000000
--- a/japanese/iv/files/patch-bs
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/bin/idraw/idcatalog.c.org	Mon Jan  3 14:37:37 2000
-+++ src/bin/idraw/idcatalog.c	Mon Jan  3 14:36:51 2000
-@@ -662,7 +662,8 @@
- 		graylevel = CalcGrayLevel(data[0]);
- 	    }
- 	} else if (graylevel == -1) {
--	    for (int i = 0; in >> _buf && i < patternHeight; i++) {
-+	    int i;
-+	    for (i = 0; in >> _buf && i < patternHeight; i++) {
- 		if (_buf[0] == '>' || sscanf(_buf, "%x", &data[i]) != 1) {
- 		    break;
- 		}
diff --git a/japanese/iv/files/patch-bt b/japanese/iv/files/patch-bt
deleted file mode 100644
index 46ba81a8d8b2..000000000000
--- a/japanese/iv/files/patch-bt
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/lib/IV-X11/xdrag.c.org	Sat Nov 14 14:14:37 1992
-+++ src/lib/IV-X11/xdrag.c	Mon Jan  3 14:44:07 2000
-@@ -230,11 +230,12 @@
-     XWindow *children;
-     unsigned int kids;
-     Status status;
-+    int i;
-     status = XQueryTree(display, root, &root, &parent, &children, &kids);
-     if (status == 0) {
- 	return None;
-     }
--    for (int i = kids - 1; i >= 0 && children[i] != under ; --i);
-+    for (i = kids - 1; i >= 0 && children[i] != under ; --i);
-     for (--i; i >= 0; --i) {
- 	XWindowAttributes attributes;
- 	XGetWindowAttributes(display, children[i], &attributes);
diff --git a/japanese/iv/files/patch-bu b/japanese/iv/files/patch-bu
deleted file mode 100644
index 59c606e1e0da..000000000000
--- a/japanese/iv/files/patch-bu
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/bin/doc/Keymap.c.org	Sat Apr 11 14:29:37 1992
-+++ src/bin/doc/Keymap.c	Mon Jan  3 14:45:40 2000
-@@ -103,6 +103,7 @@
-         _viewer != nil
-         && e.type() == Event::key && e.mapkey(s, sizeof(s)) > 0
-     ) {
-+	long i;
-         _viewer->ref();
-         ItemView* view = _viewer->focus();
-         long count = _info->count();
-@@ -110,7 +111,7 @@
-         if (key < 0) {
-             key += 256;
-         }
--        for (long i = 0; i < count; ++i) {
-+        for (i = 0; i < count; ++i) {
-             DocKeymapInfo& info = _info->item_ref(i);
-             if (info._key == key) {
-                 boolean pending_repair;
diff --git a/japanese/iv/files/patch-bv b/japanese/iv/files/patch-bv
deleted file mode 100644
index 5c3c40814c6e..000000000000
--- a/japanese/iv/files/patch-bv
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/lib/Unidraw/psview.c.org	Mon Jan  3 14:40:35 2000
-+++ src/lib/Unidraw/psview.c	Mon Jan  3 15:15:12 2000
-@@ -992,9 +992,10 @@
- 	if (dashpatsize <= 0) {
- 	    out << "[] " << dashoffset << " ";
- 	} else {
-+	    int i;
- 	    out << "[";
- 
--	    for (int i = 0; i < dashpatsize - 1; i++) {
-+	    for (i = 0; i < dashpatsize - 1; i++) {
- 		out << dashpat[i] << " ";
- 	    }
- 	    out << dashpat[i] << "] " << dashoffset << " ";
diff --git a/japanese/iv/files/patch-bw b/japanese/iv/files/patch-bw
deleted file mode 100644
index bba143cf5469..000000000000
--- a/japanese/iv/files/patch-bw
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/lib/IV-X11/xfont.c.org	Mon Jan  3 15:17:24 2000
-+++ src/lib/IV-X11/xfont.c	Mon Jan  3 15:21:01 2000
-@@ -706,7 +706,8 @@
-     int sublength = strlen(substring);
-     int length = strlen(string) - sublength;
-     for (int i = 0; i <= length; ++i) {
--        for (int j = 0; j < sublength; ++j) {
-+	int j;
-+        for (j = 0; j < sublength; ++j) {
-             if (string[i+j] != substring[j]) {
-                 break;
-             }
diff --git a/japanese/iv/files/patch-bx b/japanese/iv/files/patch-bx
deleted file mode 100644
index d5dbd2772ec4..000000000000
--- a/japanese/iv/files/patch-bx
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/lib/Unidraw/stencilcomp.c.org	Wed Mar 25 10:18:16 1992
-+++ src/lib/Unidraw/stencilcomp.c	Mon Jan  3 15:30:38 2000
-@@ -169,7 +169,7 @@
-     StencilComp* comp = (StencilComp*) GetSubject();
-     Bitmap* image, *mask;
-     comp->GetStencil()->GetOriginal(image, mask);
--    char* tag = (image == mask) ? "SSten" : "FSten";
-+    const char* tag = (image == mask) ? "SSten" : "FSten";
-     Coord w = image->Width();
-     Coord h = image->Height();
- 
diff --git a/japanese/iv/files/patch-by b/japanese/iv/files/patch-by
deleted file mode 100644
index 400553ae50de..000000000000
--- a/japanese/iv/files/patch-by
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/lib/Unidraw/text.c.org	Wed Mar 25 10:18:22 1992
-+++ src/lib/Unidraw/text.c	Mon Jan  3 15:32:12 2000
-@@ -560,9 +560,10 @@
- // errors in a Postscript string.
- 
- const char* PSText::Filter (const char* string, int len) {
-+    int dot;
-     TextBuffer stext(sbuf, 0, SBUFSIZE);
- 
--    for (int dot = 0; len--; string++) {
-+    for (dot = 0; len--; string++) {
- 	char c = *string;
- 
- 	if (!isascii(c) || iscntrl(c)) {
diff --git a/japanese/iv/files/patch-bz b/japanese/iv/files/patch-bz
deleted file mode 100644
index 7df7c2a9e5ec..000000000000
--- a/japanese/iv/files/patch-bz
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/bin/idraw/ided.c.org	Mon Jan  3 15:33:16 2000
-+++ src/bin/idraw/ided.c	Mon Jan  3 15:36:25 2000
-@@ -362,7 +362,7 @@
-     return commands;
- }
- 
--static const unit = 15;
-+static const int unit = 15;
- 
- static Coord xClosed[] = { unit/5, unit, unit, unit*3/5, 0 };
- static Coord yClosed[] = { 0, unit/5, unit*3/5, unit, unit*2/5 };
diff --git a/japanese/iv/files/patch-ca b/japanese/iv/files/patch-ca
deleted file mode 100644
index a47188bc943b..000000000000
--- a/japanese/iv/files/patch-ca
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/bin/ibuild/ibvars.h.org	Thu Jul 16 07:36:21 1992
-+++ src/bin/ibuild/ibvars.h	Wed Jan  5 22:08:03 2000
-@@ -232,7 +232,7 @@
- 
- inline boolean MemberSharedName::GetExport() { return _export; }
- inline SubclassNameVar* MemberSharedName::GetSubclass () { return _subclass; }
--inline void MemberSharedName::SetExport(boolean export) { _export = export;}
-+inline void MemberSharedName::SetExport(boolean m_export) { _export = m_export;}
- inline int& MemberSharedName::GetSerial () { return _mSerial; }
- inline IDVar* MemberSharedName::GetIDVar () { return _idVar; }
- 
-@@ -326,7 +326,7 @@
- inline int ButtonSharedName::GetInitial() { return _initial; }
- inline void ButtonSharedName::SetInitial(int initial) { _initial = initial;}
- inline boolean ButtonSharedName::GetExport() { return _export; }
--inline void ButtonSharedName::SetExport(boolean export) { _export = export;}
-+inline void ButtonSharedName::SetExport(boolean m_export) { _export = m_export;}
- inline const char* ButtonSharedName::GetFuncName() { return _func; }
- inline int& ButtonSharedName::GetSerial() { return _bsSerial; }
- inline SubclassNameVar* ButtonSharedName::GetSubclass () { return _subclass; }
diff --git a/japanese/iv/files/patch-cb b/japanese/iv/files/patch-cb
deleted file mode 100644
index a46436b41e4e..000000000000
--- a/japanese/iv/files/patch-cb
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/bin/ibuild/ibcatalog.c.org	Wed Sep  9 07:36:27 1992
-+++ src/bin/ibuild/ibcatalog.c	Wed Jan  5 22:12:40 2000
-@@ -614,7 +614,8 @@
- 		graylevel = CalcGrayLevel(data[0]);
- 	    }
- 	} else if (graylevel == -1) {
--	    for (int i = 0; in >> _buf && i < patternHeight; i++) {
-+	    int i;
-+	    for (i = 0; in >> _buf && i < patternHeight; i++) {
- 		if (_buf[0] == '>' || sscanf(_buf, "%x", &data[i]) != 1) {
- 		    break;
- 		}
diff --git a/japanese/iv/files/patch-cc b/japanese/iv/files/patch-cc
deleted file mode 100644
index 76b37cdeb951..000000000000
--- a/japanese/iv/files/patch-cc
+++ /dev/null
@@ -1,41 +0,0 @@
---- src/bin/ibuild/ibdialog.c.orig	Wed Oct 28 10:19:27 1992
-+++ src/bin/ibuild/ibdialog.c	Wed Jul  9 23:23:46 2003
-@@ -35,9 +35,20 @@
- #include <Unidraw/unidraw.h>
- #include <Unidraw/viewer.h>
- #include <Unidraw/catalog.h>
-+#if __FreeBSD__ >= 2
-+#include <osreldate.h>
-+#if __FreeBSD_cc_version >= 400003
-+#include <stdio.h>
-+#endif
-+#endif
- #include <stream.h>
- #include <string.h>
- 
-+#if (__FreeBSD_version > 500000)
-+extern "C" {
-+	extern int      sprintf(char * __restrict, const char * __restrict, ...);
-+}
-+#endif
- /*****************************************************************************/
- 
- DialogClass::DialogClass (IBGraphic* gr) : MonoSceneClass(gr) {
-@@ -380,7 +391,7 @@
-     strcat(ButtonClass, "_Button");
-     const char* proc = bsVar->GetFuncName();
-     
--    boolean export = bsVar->GetExport();
-+    boolean getexport = bsVar->GetExport();
-     CodeView* kidview = GetKidView();
-     MemberNameVar* kidname;
-     if (kidview != nil) {
-@@ -407,7 +418,7 @@
- 
-     out << "Interactor*" << coreclass;
-     out << "::Interior() {\n";
--    if (export) {
-+    if (getexport) {
-         out << "    " << bsVar->GetName() << " = state;\n";
-     } else {
-         out << "    ButtonState* ";
diff --git a/japanese/iv/files/patch-cd b/japanese/iv/files/patch-cd
deleted file mode 100644
index 0fc7e791112b..000000000000
--- a/japanese/iv/files/patch-cd
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/bin/ibuild/ibed.c.org	Wed Nov 11 03:16:15 1992
-+++ src/bin/ibuild/ibed.c	Wed Jan  5 22:42:25 2000
-@@ -672,7 +672,7 @@
-     return tools;
- }
- 
--static const unit = 15;
-+static const int unit = 15;
- 
- static Coord xClosed[] = { unit/5, unit, unit, unit*3/5, 0 };
- static Coord yClosed[] = { 0, unit/5, unit*3/5, unit, unit*2/5 };
diff --git a/japanese/iv/files/patch-ce b/japanese/iv/files/patch-ce
deleted file mode 100644
index 63711575caba..000000000000
--- a/japanese/iv/files/patch-ce
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/bin/ibuild/ibglue.c.org	Sat Apr 25 05:14:55 1992
-+++ src/bin/ibuild/ibglue.c	Wed Jan  5 22:44:05 2000
-@@ -271,14 +271,14 @@
-             strcpy(VGlueClass, coreclass);
-             strcat(VGlueClass, "_VGlue");
-             
--            boolean export = icomp->GetMemberNameVar()->GetExport();
-+            boolean getexport = icomp->GetMemberNameVar()->GetExport();
-             const char* classname = icomp->GetClassNameVar()->GetName();
-             if (icomp->GetClassNameVar()->IsSubclass()) {
-                 BeginInstantiate(out);
-                 out << "(";
- 
-             } else {
--                if (export && !_emitMain) {
-+                if (getexport && !_emitMain) {
-                     out << "    " << mname << " = new ";
-                 } else {
-                     out << "    " << classname << "* ";
diff --git a/japanese/iv/files/patch-cf b/japanese/iv/files/patch-cf
deleted file mode 100644
index 97972e5fa605..000000000000
--- a/japanese/iv/files/patch-cf
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/bin/ibuild/ibmenu.c.org	Wed Sep  9 07:34:15 1992
-+++ src/bin/ibuild/ibmenu.c	Wed Jan  5 22:45:28 2000
-@@ -403,7 +403,7 @@
-             
-             const char* proc = menuItem->GetTrackNameVar()->GetName();
-             const char* text = menuItem->GetMenuItemGraphic()->GetText();
--            boolean export = icomp->GetMemberNameVar()->GetExport();
-+            boolean getexport = icomp->GetMemberNameVar()->GetExport();
-             Shape* shape = icomp->GetShapeVar()->GetShape();
-             
-             if (icomp->GetClassNameVar()->IsSubclass()) {
-@@ -411,7 +411,7 @@
-                 out << "(";
-                 
-             } else {
--                if (export && !_emitMain) {
-+                if (getexport && !_emitMain) {
-                     out << "    " << mname << " = ";
-                     out << "new " << MenuClass;
-                 } else {
-@@ -431,7 +431,7 @@
-             EndInstantiate(out);
-             
-             if (!_emitMain && proc != nil && *proc != '\0') {
--                if (!export || icomp->GetClassNameVar()->IsSubclass()) {
-+                if (!getexport || icomp->GetClassNameVar()->IsSubclass()) {
-                     out << "    " << mname << "->SetCoreClass(this);\n";
-                     out <<"    "<< mname <<"->SetCoreFunc("<< "&" << coreclass;
-                     out << "::" << proc << ");\n";
diff --git a/japanese/iv/files/patch-cg b/japanese/iv/files/patch-cg
deleted file mode 100644
index c110775fe8fd..000000000000
--- a/japanese/iv/files/patch-cg
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/bin/ibuild/ibpanelctrl.c.org	Wed Nov 11 03:16:39 1992
-+++ src/bin/ibuild/ibpanelctrl.c	Wed Jan  5 22:46:29 2000
-@@ -871,13 +871,13 @@
-     } else if (_emitBSInits) {
-         ButtonStateVar* bsVar = pcComp->GetButtonStateVar();
- 	const char* name = bsVar->GetName();
--        boolean export = bsVar->GetExport();
-+        boolean getexport = bsVar->GetExport();
-         const char* subclass = bsVar->GetSubclassName();
- 
- 	if (!_bsinitslist->Search(name)) {
- 	    _bsinitslist->Append(name);
- 
--            if (export && !_emitMain) {
-+            if (getexport && !_emitMain) {
-                 out << "    " << name;
- 
-             } else {
diff --git a/japanese/iv/files/patch-ch b/japanese/iv/files/patch-ch
deleted file mode 100644
index 891f7b89aeb6..000000000000
--- a/japanese/iv/files/patch-ch
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/bin/ibuild/ibslider.c.org	Tue Jun  9 04:44:50 1992
-+++ src/bin/ibuild/ibslider.c	Wed Jan  5 22:47:49 2000
-@@ -416,7 +416,7 @@
-                 strcpy(SliderClass, coreclass);
-                 strcat(SliderClass, "_Slider");
-                 
--                boolean export = icomp->GetMemberNameVar()->GetExport();
-+                boolean getexport = icomp->GetMemberNameVar()->GetExport();
-                 const char* classname = icomp->GetClassNameVar()->GetName();
- 
- 		int w = icomp->GetCanvasVar()->Width();
-@@ -426,7 +426,7 @@
-                     BeginInstantiate(out);
-                     out << "(";
-                 } else {
--                    if (export && !_emitMain) {
-+                    if (getexport && !_emitMain) {
-                         out << "    " << mname << " = new " << SliderClass;
-                         out << "(";
-                     } else {
diff --git a/japanese/iv/files/patch-ci b/japanese/iv/files/patch-ci
deleted file mode 100644
index 8fff0d34f83a..000000000000
--- a/japanese/iv/files/patch-ci
+++ /dev/null
@@ -1,28 +0,0 @@
---- src/bin/ibuild/ibvars.c.org	Wed Sep  9 07:33:42 1992
-+++ src/bin/ibuild/ibvars.c	Wed Jan  5 22:49:34 2000
-@@ -371,9 +371,9 @@
- /*****************************************************************************/
- 
- MemberSharedName::MemberSharedName (
--    const char* name, boolean export, boolean machgen
-+    const char* name, boolean b_export, boolean machgen
- ) : SharedName(name, machgen) {
--    _export = export;
-+    _export = b_export;
-     _subclass = new SubclassNameVar("", false, false);
-     _subclass->ref();
-     _idVar = nil;
-@@ -471,11 +471,11 @@
- 
- /*****************************************************************************/
- MemberNameVar::MemberNameVar (
--    const char* name, boolean export, boolean machgen
-+    const char* name, boolean b_export, boolean machgen
- ) {
-     _msharedname = nil;
-     if (name != nil) {
--        _msharedname = new MemberSharedName(name, export, machgen);
-+        _msharedname = new MemberSharedName(name, b_export, machgen);
-         _msharedname->ref();
-     }
- }
diff --git a/japanese/iv/files/patch-cj b/japanese/iv/files/patch-cj
deleted file mode 100644
index aaf287a80867..000000000000
--- a/japanese/iv/files/patch-cj
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/bin/ibuild/ibvarviews.c.org	Sat Apr 25 05:15:01 1992
-+++ src/bin/ibuild/ibvarviews.c	Wed Jan  5 22:50:51 2000
-@@ -1399,7 +1399,7 @@
-                 GetConflictCmd sconflict(firewallCmd.GetFirewall(),subclass);
-                 sconflict.Execute();
-                 cl = sconflict.GetConflict();
--                for(i = cl->First(); i != cl->End(); i = i->Next()) {
-+                for(UList* i = cl->First(); i != cl->End(); i = i->Next()) {
-                     StateVar* state = (StateVar*) (*i)();
-                     if (
-                         !state->IsA(INSTANCENAME_VAR) && 
diff --git a/japanese/iv/files/patch-ck b/japanese/iv/files/patch-ck
deleted file mode 100644
index 5137635c8603..000000000000
--- a/japanese/iv/files/patch-ck
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -Ncr src/bin/idraw/idarrowhead.c src/bin/idraw/idarrowhead.c
-*** src/bin/idraw/idarrowhead.c	Thu Dec 12 08:49:18 1991
---- src/bin/idraw/idarrowhead.c	Sat Feb  6 19:05:49 1999
-***************
-*** 51,56 ****
---- 51,75 ----
-  
-  Graphic* Arrowhead::Copy () { return new Arrowhead(_x, _y, this); }
-  Graphic& Arrowhead::operator = (Graphic& g) { return Graphic::operator=(g); }
-+ Arrowhead& Arrowhead::operator = (Arrowhead& a) {
-+     Graphic::operator=(a);
-+ 
-+     _count = 0;
-+     if (_y)
-+ 	delete[] _y;
-+     if (_x)
-+ 	delete[] _x;
-+     _x = _y = nil;
-+     if (! a._count)
-+ 	return *this;
-+ 
-+     _count = a._count;
-+     _x = new Coord[_count];
-+     _y = new Coord[_count];
-+     ::memcpy(_x, a._x, sizeof(Coord) * _count);
-+     ::memcpy(_y, a._y, sizeof(Coord) * _count);
-+     return *this;
-+ }
-  
-  Coord Arrowhead::CorrectedHeight (float t) {
-      float w = _x[BOTRIGHT] - _x[BOTCTR];
diff --git a/japanese/iv/files/patch-cl b/japanese/iv/files/patch-cl
deleted file mode 100644
index 91cf254f59bf..000000000000
--- a/japanese/iv/files/patch-cl
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Ncr src/bin/idraw/idarrowhead.h src/bin/idraw/idarrowhead.h
-*** src/bin/idraw/idarrowhead.h	Thu Dec 12 08:49:19 1991
---- src/bin/idraw/idarrowhead.h	Sat Feb  6 19:05:49 1999
-***************
-*** 37,42 ****
---- 37,43 ----
-  
-      virtual Graphic* Copy();
-      virtual Graphic& operator = (Graphic&);
-+     virtual Arrowhead& operator = (Arrowhead&);
-  protected:
-      Arrowhead(Coord*, Coord*, Graphic*);
-  
diff --git a/japanese/iv/files/patch-cm b/japanese/iv/files/patch-cm
deleted file mode 100644
index 4039a45aaaed..000000000000
--- a/japanese/iv/files/patch-cm
+++ /dev/null
@@ -1,117 +0,0 @@
-diff -Ncr src/bin/idraw/idarrows.c src/bin/idraw/idarrows.c
-*** src/bin/idraw/idarrows.c	Sat Feb  6 19:11:32 1999
---- src/bin/idraw/idarrows.c	Sat Feb  6 19:05:49 1999
-***************
-*** 295,311 ****
-  }
-  
-  boolean ArrowMultiLine::contains (PointObj& po, Graphic* gs) {
-!     return 
-!         SF_MultiLine::contains(po, gs) || 
-!         Head() && ArrowheadContains(_head, po, gs) ||
-!         Tail() && ArrowheadContains(_tail, po, gs);
-  }
-  
-  boolean ArrowMultiLine::intersects (BoxObj& bo, Graphic* gs) {
-!     return 
-!         SF_MultiLine::intersects(bo, gs) || 
-!         Head() && ArrowheadIntersects(_head, bo, gs) ||
-!         Tail() && ArrowheadIntersects(_tail, bo, gs);
-  }
-  
-  void ArrowMultiLine::draw (Canvas* c, Graphic* gs) {
---- 295,331 ----
-  }
-  
-  boolean ArrowMultiLine::contains (PointObj& po, Graphic* gs) {
-!     PSPattern *pat;
-!     boolean ret;
-! 
-!     if (Head() || Tail()) {
-! 	pat = gs->GetPattern();
-! 	gs->SetPattern(psnonepat);
-!     }	
-!     ret = (SF_MultiLine::contains(po, gs)
-! 	   || (Head() && ArrowheadContains(_head, po, gs))
-! 	   || (Tail() && ArrowheadContains(_tail, po, gs)));
-!     if (Head() || Tail()) {
-! 	gs->SetPattern(pat);
-!     }
-!     return ret;
-  }
-  
-  boolean ArrowMultiLine::intersects (BoxObj& bo, Graphic* gs) {
-!     PSPattern *pat;
-!     boolean ret;
-! 
-!     if (Head() || Tail()) {
-! 	pat = gs->GetPattern();
-! 	gs->SetPattern(psnonepat);
-!     }	
-!     ret = (SF_MultiLine::intersects(bo, gs)
-! 	   || (Head() && ArrowheadIntersects(_head, bo, gs))
-! 	   || (Tail() && ArrowheadIntersects(_tail, bo, gs)));
-!     if (Head() || Tail()) {
-! 	gs->SetPattern(pat);
-!     }
-!     return ret;
-  }
-  
-  void ArrowMultiLine::draw (Canvas* c, Graphic* gs) {
-***************
-*** 486,502 ****
-  }
-  
-  boolean ArrowOpenBSpline::contains (PointObj& po, Graphic* gs) {
-!     return 
-!         SFH_OpenBSpline::contains(po, gs) || 
-!         Head() && ArrowheadContains(_head, po, gs) ||
-!         Tail() && ArrowheadContains(_tail, po, gs);
-  }
-  
-  boolean ArrowOpenBSpline::intersects (BoxObj& bo, Graphic* gs) {
-!     return 
-!         SFH_OpenBSpline::intersects(bo, gs) || 
-!         Head() && ArrowheadIntersects(_head, bo, gs) ||
-!         Tail() && ArrowheadIntersects(_tail, bo, gs);
-  }
-  
-  void ArrowOpenBSpline::draw (Canvas* c, Graphic* gs) {
---- 506,542 ----
-  }
-  
-  boolean ArrowOpenBSpline::contains (PointObj& po, Graphic* gs) {
-!     PSPattern *pat;
-!     boolean ret;
-! 
-!     if (Head() || Tail()) {
-! 	pat = gs->GetPattern();
-! 	gs->SetPattern(psnonepat);
-!     }	
-!     ret = (SFH_OpenBSpline::contains(po, gs)
-! 	   || (Head() && ArrowheadContains(_head, po, gs))
-! 	   || (Tail() && ArrowheadContains(_tail, po, gs)));
-!     if (Head() || Tail()) {
-! 	gs->SetPattern(pat);
-!     }
-!     return ret;
-  }
-  
-  boolean ArrowOpenBSpline::intersects (BoxObj& bo, Graphic* gs) {
-!     PSPattern *pat;
-!     boolean ret;
-! 
-!     if (Head() || Tail()) {
-! 	pat = gs->GetPattern();
-! 	gs->SetPattern(psnonepat);
-!     }	
-!     ret = (SFH_OpenBSpline::intersects(bo, gs)
-! 	   || (Head() && ArrowheadIntersects(_head, bo, gs))
-! 	   || (Tail() && ArrowheadIntersects(_tail, bo, gs)));
-!     if (Head() || Tail()) {
-! 	gs->SetPattern(pat);
-!     }
-!     return ret;
-  }
-  
-  void ArrowOpenBSpline::draw (Canvas* c, Graphic* gs) {
diff --git a/japanese/iv/files/patch-cn b/japanese/iv/files/patch-cn
deleted file mode 100644
index 72afe13bf958..000000000000
--- a/japanese/iv/files/patch-cn
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -Ncr src/lib/IV-X11/xjivfunc.c src/lib/IV-X11/xjivfunc.c
-*** src/lib/IV-X11/xjivfunc.c	Sat Feb  6 19:11:35 1999
---- src/lib/IV-X11/xjivfunc.c	Sat Feb  6 19:05:50 1999
-***************
-*** 110,115 ****
---- 110,116 ----
-  	    rb += c.rbearing;
-  	}
-      }
-+     delete[] ss;
-      return rb;
-  }
-  
-***************
-*** 175,180 ****
---- 176,182 ----
-  	    w += c.width;
-  	}
-      }
-+     delete[] ss;
-      return w;
-  }
-  
-***************
-*** 248,253 ****
---- 250,256 ----
-  	    }
-  	}
-      }
-+     delete[] ss;
-      return a;
-  }
-  
-***************
-*** 321,326 ****
---- 324,330 ----
-  	    }
-  	}
-      }
-+     delete[] ss;
-      return d;
-  }
-  
-***************
-*** 404,409 ****
---- 408,414 ----
-  	    XDrawString(dpy, d, gc, x, y, (const char*)ss, sl);
-  	}
-      }
-+     delete[] ss;
-  }
-  
-  void JIVDrawImageString(XDisplay *dpy, XDrawable d, GC gc, const Font* f,
-***************
-*** 487,492 ****
---- 492,498 ----
-  	    XDrawImageString(dpy, d, gc, x, y, (const char*)ss, sl);
-  	}
-      }
-+     delete[] ss;
-  }
-  
-  #endif /* JIV */
diff --git a/japanese/iv/files/patch-co b/japanese/iv/files/patch-co
deleted file mode 100644
index 113433158ab4..000000000000
--- a/japanese/iv/files/patch-co
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/bin/scripts/mkdirhier.sh.orig	Wed Aug 16 03:15:19 2000
-+++ src/bin/scripts/mkdirhier.sh	Wed Aug 16 03:15:56 2000
-@@ -52,7 +52,7 @@
- 			done
- 
- 			mkdir $paths || status=$?
--			chmod g+w $paths
-+			chmod g-w $paths
- 
- 			break
- 		}
diff --git a/japanese/iv/files/patch-cp b/japanese/iv/files/patch-cp
deleted file mode 100644
index 13a2638c251e..000000000000
--- a/japanese/iv/files/patch-cp
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/lib/IV-2_6/rubrect.c.org	Wed Sep 25 22:28:00 2002
-+++ src/lib/IV-2_6/rubrect.c	Wed Sep 25 22:28:59 2002
-@@ -32,7 +32,11 @@
- #include <math.h>
- #include <stdlib.h>
- #ifndef apollo
-+#ifdef __FreeBSD__
-+#include <limits.h>
-+#else
- #include <values.h>
-+#endif
- #endif
- 
- RubberRect::RubberRect(
diff --git a/japanese/iv/files/patch-cq b/japanese/iv/files/patch-cq
deleted file mode 100644
index cc8ffd6a8b55..000000000000
--- a/japanese/iv/files/patch-cq
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/lib/Dispatch/dispatcher.c.orig	Thu Jul 10 00:04:15 2003
-+++ src/lib/Dispatch/dispatcher.c	Thu Jul 10 00:05:36 2003
-@@ -43,12 +43,16 @@
- #include <sys/time.h>
- #include <time.h>
- 
-+#if __FreeBSD__ >= 2
-+#include <osreldate.h>
-+#endif
-+
- /* no standard place for this */
- extern "C" {
- #if defined(hpux)
-     extern int select(size_t, int*, int*, int*, const struct timeval*);
- #else
--#if !defined(AIXV3) && !defined(Solaris_2) && !defined(__lucid) && !defined(linux)
-+#if !defined(AIXV3) && !defined(Solaris_2) && !defined(__lucid) && !defined(linux) && !(defined(__FreeBSD__) && (__FreeBSD_version > 500000))
-     extern int select(int, fd_set*, fd_set*, fd_set*, const struct timeval*);
- #endif
- #endif
diff --git a/japanese/iv/pkg-descr b/japanese/iv/pkg-descr
deleted file mode 100644
index 336dd32c8e2e..000000000000
--- a/japanese/iv/pkg-descr
+++ /dev/null
@@ -1,33 +0,0 @@
-* How to use Interviews / idraw
-
-    Binary files are installed to ${prefix}/interviews/bin directory.
-  Please add ${prefix}/interviews/bin to your path variable.
-
-    For example (with csh or tcsh):
-		% set path = ( $path /usr/local/interviews/bin )
-		% rehash
-		% kinput2 &
-		% idraw
-
-    Enjoy!!
-
-* support code of CID-Keyed font PostScript Engine is included.
-
-* Acknowledgement
-
-   Special thanks to:
-	Akihiro SATO <akisatoh@gallop.ics.nitech.ac.jp>
-	He created first ports style files of ja-InterViews.
-
-	KATAYAMA <katayama@rd.nacsis.ac.jp>
-	He created fixeucfont-1.2 which convertor for CID-keyed font
-	PostScript Engine.
-	http://www.rd.nacsis.ac.jp/~katayama/homepage/fixeucfont/
-
-	FURUKAWA <yasu@on.cs.keio.ac.jp>
-	He created fixcmpfont patch from fixeucfont-1.2.
-	And, he fixed critical bug under egcs g++.
-	http://www.on.cs.keio.ac.jp/~yasu/linux/interviews/
-
-Yoshiro MIHIRA
-<sanpei@sanpei.org>
diff --git a/japanese/iv/pkg-plist b/japanese/iv/pkg-plist
deleted file mode 100644
index 2cbc9078a14c..000000000000
--- a/japanese/iv/pkg-plist
+++ /dev/null
@@ -1,563 +0,0 @@
-interviews/config/InterViews/template
-interviews/config/InterViews/TIFF.def
-interviews/config/InterViews/arch.def
-interviews/config/InterViews/gcc.def
-interviews/config/InterViews/local.def
-interviews/config/InterViews/params.def
-interviews/config/InterViews/rules.def
-interviews/config/InterViews/iv-DGUX.cf
-interviews/config/InterViews/iv-Mips.cf
-interviews/config/InterViews/iv-aix.cf
-interviews/config/InterViews/iv-apollo.cf
-interviews/config/InterViews/iv-att.cf
-interviews/config/InterViews/iv-bsd.cf
-interviews/config/InterViews/iv-convex.cf
-interviews/config/InterViews/iv-cray.cf
-interviews/config/InterViews/iv-freebsd.cf
-interviews/config/InterViews/iv-generic.cf
-interviews/config/InterViews/iv-hp.cf
-interviews/config/InterViews/iv-ibm.cf
-interviews/config/InterViews/iv-linux.cf
-interviews/config/InterViews/iv-luna.cf
-interviews/config/InterViews/iv-m4330.cf
-interviews/config/InterViews/iv-macII.cf
-interviews/config/InterViews/iv-moto.cf
-interviews/config/InterViews/iv-pegasus.cf
-interviews/config/InterViews/iv-sgi.cf
-interviews/config/InterViews/iv-sony.cf
-interviews/config/InterViews/iv-stellar.cf
-interviews/config/InterViews/iv-sun.cf
-interviews/config/InterViews/iv-ultrix.cf
-interviews/config/InterViews/iv-x386.cf
-interviews/config/InterViews/xparams.cf
-interviews/include/Dispatch/_defines.h
-interviews/include/Dispatch/_undefs.h
-interviews/include/Dispatch/dispatcher.h
-interviews/include/Dispatch/dp.h
-interviews/include/Dispatch/enter-scope.h
-interviews/include/Dispatch/iocallback.h
-interviews/include/Dispatch/iohandler.h
-interviews/include/Dispatch/iostreamb.h
-interviews/include/Dispatch/leave-scope.h
-interviews/include/Dispatch/rpcbuf.h
-interviews/include/Dispatch/rpchdr.h
-interviews/include/Dispatch/rpcpeer.h
-interviews/include/Dispatch/rpcreader.h
-interviews/include/Dispatch/rpcregistry.h
-interviews/include/Dispatch/rpcservice.h
-interviews/include/Dispatch/rpcstream.h
-interviews/include/Dispatch/rpcwriter.h
-interviews/include/IV-2_6/_enter.h
-interviews/include/IV-2_6/_leave.h
-interviews/include/IV-2_6/_names.h
-interviews/include/IV-2_6/InterViews/adjuster.h
-interviews/include/IV-2_6/InterViews/alignment.h
-interviews/include/IV-2_6/InterViews/banner.h
-interviews/include/IV-2_6/InterViews/border.h
-interviews/include/IV-2_6/InterViews/box.h
-interviews/include/IV-2_6/InterViews/button.h
-interviews/include/IV-2_6/InterViews/compeditor.h
-interviews/include/IV-2_6/InterViews/control.h
-interviews/include/IV-2_6/InterViews/deck.h
-interviews/include/IV-2_6/InterViews/defs.h
-interviews/include/IV-2_6/InterViews/dialog.h
-interviews/include/IV-2_6/InterViews/filebrowser.h
-interviews/include/IV-2_6/InterViews/filechooser.h
-interviews/include/IV-2_6/InterViews/frame.h
-interviews/include/IV-2_6/InterViews/glue.h
-interviews/include/IV-2_6/InterViews/ihandler.h
-interviews/include/IV-2_6/InterViews/interactor.h
-interviews/include/IV-2_6/InterViews/iwindow.h
-interviews/include/IV-2_6/InterViews/matcheditor.h
-interviews/include/IV-2_6/InterViews/menu.h
-interviews/include/IV-2_6/InterViews/message.h
-interviews/include/IV-2_6/InterViews/minmax.h
-interviews/include/IV-2_6/InterViews/paint.h
-interviews/include/IV-2_6/InterViews/painter.h
-interviews/include/IV-2_6/InterViews/scene.h
-interviews/include/IV-2_6/InterViews/panner.h
-interviews/include/IV-2_6/InterViews/perspective.h
-interviews/include/IV-2_6/InterViews/rubband.h
-interviews/include/IV-2_6/InterViews/rubcurve.h
-interviews/include/IV-2_6/InterViews/rubgroup.h
-interviews/include/IV-2_6/InterViews/rubline.h
-interviews/include/IV-2_6/InterViews/rubrect.h
-interviews/include/IV-2_6/InterViews/rubverts.h
-interviews/include/IV-2_6/InterViews/scrollbar.h
-interviews/include/IV-2_6/InterViews/scroller.h
-interviews/include/IV-2_6/InterViews/sensor.h
-interviews/include/IV-2_6/InterViews/shape.h
-interviews/include/IV-2_6/InterViews/strbrowser.h
-interviews/include/IV-2_6/InterViews/strchooser.h
-interviews/include/IV-2_6/InterViews/streditor.h
-interviews/include/IV-2_6/InterViews/subject.h
-interviews/include/IV-2_6/InterViews/textbuffer.h
-interviews/include/IV-2_6/InterViews/textdisplay.h
-interviews/include/IV-2_6/InterViews/texteditor.h
-interviews/include/IV-2_6/InterViews/textstyle.h
-interviews/include/IV-2_6/InterViews/tray.h
-interviews/include/IV-2_6/InterViews/viewport.h
-interviews/include/IV-2_6/InterViews/world.h
-interviews/include/IV-X11/Xdefs.h
-interviews/include/IV-X11/Xext.h
-interviews/include/IV-X11/Xlib.h
-interviews/include/IV-X11/Xundefs.h
-interviews/include/IV-X11/Xutil.h
-interviews/include/IV-X11/xbitmap.h
-interviews/include/IV-X11/xbrush.h
-interviews/include/IV-X11/xcanvas.h
-interviews/include/IV-X11/xcolor.h
-interviews/include/IV-X11/xcursor.h
-interviews/include/IV-X11/xdisplay.h
-interviews/include/IV-X11/xdrag.h
-interviews/include/IV-X11/xevent.h
-interviews/include/IV-X11/xfont.h
-interviews/include/IV-X11/xjivfunc.h
-interviews/include/IV-X11/xpainter.h
-interviews/include/IV-X11/xpattern.h
-interviews/include/IV-X11/xraster.h
-interviews/include/IV-X11/xselection.h
-interviews/include/IV-X11/xwindow.h
-interviews/include/IV-look/bevel.h
-interviews/include/IV-look/browser.h
-interviews/include/IV-look/button.h
-interviews/include/IV-look/choice.h
-interviews/include/IV-look/dialogs.h
-interviews/include/IV-look/fbrowser.h
-interviews/include/IV-look/fchooser.h
-interviews/include/IV-look/field.h
-interviews/include/IV-look/kit.h
-interviews/include/IV-look/menu.h
-interviews/include/IV-look/mf_dialogs.h
-interviews/include/IV-look/mf_kit.h
-interviews/include/IV-look/mono_kit.h
-interviews/include/IV-look/ol_dialogs.h
-interviews/include/IV-look/ol_kit.h
-interviews/include/IV-look/slider.h
-interviews/include/IV-look/smf_kit.h
-interviews/include/IV-look/stepper.h
-interviews/include/IV-look/telltale.h
-interviews/include/InterViews/_defines.h
-interviews/include/InterViews/_enter.h
-interviews/include/InterViews/_leave.h
-interviews/include/InterViews/_names.h
-interviews/include/InterViews/_undefs.h
-interviews/include/InterViews/action.h
-interviews/include/InterViews/adjust.h
-interviews/include/InterViews/aggr.h
-interviews/include/InterViews/align.h
-interviews/include/InterViews/alloctbl.h
-interviews/include/InterViews/arraycomp.h
-interviews/include/InterViews/background.h
-interviews/include/InterViews/bitmap.h
-interviews/include/InterViews/boolean.h
-interviews/include/InterViews/border.h
-interviews/include/InterViews/box.h
-interviews/include/InterViews/brush.h
-interviews/include/InterViews/canvas.h
-interviews/include/InterViews/character.h
-interviews/include/InterViews/clthandler.h
-interviews/include/InterViews/color.h
-interviews/include/InterViews/composition.h
-interviews/include/InterViews/compositor.h
-interviews/include/InterViews/coord.h
-interviews/include/InterViews/debug.h
-interviews/include/InterViews/cursor.h
-interviews/include/InterViews/deck.h
-interviews/include/InterViews/dialog.h
-interviews/include/InterViews/display.h
-interviews/include/InterViews/drag.h
-interviews/include/InterViews/enter-scope.h
-interviews/include/InterViews/event.h
-interviews/include/InterViews/font.h
-interviews/include/InterViews/geometry.h
-interviews/include/InterViews/glcontext.h
-interviews/include/InterViews/glue.h
-interviews/include/InterViews/glyph.h
-interviews/include/InterViews/group.h
-interviews/include/InterViews/handler.h
-interviews/include/InterViews/hit.h
-interviews/include/InterViews/image.h
-interviews/include/InterViews/input.h
-interviews/include/InterViews/iv.h
-interviews/include/InterViews/kinput.h
-interviews/include/InterViews/label.h
-interviews/include/InterViews/layout.h
-interviews/include/InterViews/leave-scope.h
-interviews/include/InterViews/lrmarker.h
-interviews/include/InterViews/monoglyph.h
-interviews/include/InterViews/observe.h
-interviews/include/InterViews/page.h
-interviews/include/InterViews/patch.h
-interviews/include/InterViews/pattern.h
-interviews/include/InterViews/place.h
-interviews/include/InterViews/polyglyph.h
-interviews/include/InterViews/printer.h
-interviews/include/InterViews/psfont.h
-interviews/include/InterViews/raster.h
-interviews/include/InterViews/regexp.h
-interviews/include/InterViews/reqerr.h
-interviews/include/InterViews/resource.h
-interviews/include/InterViews/rule.h
-interviews/include/InterViews/scrbox.h
-interviews/include/InterViews/selection.h
-interviews/include/InterViews/session.h
-interviews/include/InterViews/shadow.h
-interviews/include/InterViews/simplecomp.h
-interviews/include/InterViews/stencil.h
-interviews/include/InterViews/style.h
-interviews/include/InterViews/superpose.h
-interviews/include/InterViews/target.h
-interviews/include/InterViews/telltale.h
-interviews/include/InterViews/texcomp.h
-interviews/include/InterViews/tformsetter.h
-interviews/include/InterViews/tiff.h
-interviews/include/InterViews/tile.h
-interviews/include/InterViews/transformer.h
-interviews/include/InterViews/window.h
-interviews/include/InterViews/xymarker.h
-interviews/include/InterViews/Bitmaps/big_checkmark.bm
-interviews/include/InterViews/Bitmaps/checkmark.bm
-interviews/include/InterViews/Bitmaps/chkbox.bm
-interviews/include/InterViews/Bitmaps/chkboxBoth.bm
-interviews/include/InterViews/Bitmaps/chkboxChosen.bm
-interviews/include/InterViews/Bitmaps/chkboxHit.bm
-interviews/include/InterViews/Bitmaps/dfast.bm
-interviews/include/InterViews/Bitmaps/dfastMask.bm
-interviews/include/InterViews/Bitmaps/dmover.bm
-interviews/include/InterViews/Bitmaps/dmoverHit.bm
-interviews/include/InterViews/Bitmaps/dmoverMask.bm
-interviews/include/InterViews/Bitmaps/enlarge.bm
-interviews/include/InterViews/Bitmaps/enlargeHit.bm
-interviews/include/InterViews/Bitmaps/enlargeMask.bm
-interviews/include/InterViews/Bitmaps/hand.bm
-interviews/include/InterViews/Bitmaps/handMask.bm
-interviews/include/InterViews/Bitmaps/ldfast.bm
-interviews/include/InterViews/Bitmaps/ldfastMask.bm
-interviews/include/InterViews/Bitmaps/lfast.bm
-interviews/include/InterViews/Bitmaps/lfastMask.bm
-interviews/include/InterViews/Bitmaps/lmover.bm
-interviews/include/InterViews/Bitmaps/lufast.bm
-interviews/include/InterViews/Bitmaps/lmoverHit.bm
-interviews/include/InterViews/Bitmaps/lmoverMask.bm
-interviews/include/InterViews/Bitmaps/lufastMask.bm
-interviews/include/InterViews/Bitmaps/page.bm
-interviews/include/InterViews/Bitmaps/pageBoth.bm
-interviews/include/InterViews/Bitmaps/pageChosen.bm
-interviews/include/InterViews/Bitmaps/pageHit.bm
-interviews/include/InterViews/Bitmaps/radio.bm
-interviews/include/InterViews/Bitmaps/radioBoth.bm
-interviews/include/InterViews/Bitmaps/radioChosen.bm
-interviews/include/InterViews/Bitmaps/radioHit.bm
-interviews/include/InterViews/Bitmaps/radioMask.bm
-interviews/include/InterViews/Bitmaps/rdfast.bm
-interviews/include/InterViews/Bitmaps/rdfastMask.bm
-interviews/include/InterViews/Bitmaps/reducer.bm
-interviews/include/InterViews/Bitmaps/reducerHit.bm
-interviews/include/InterViews/Bitmaps/reducerMask.bm
-interviews/include/InterViews/Bitmaps/rfast.bm
-interviews/include/InterViews/Bitmaps/rfastMask.bm
-interviews/include/InterViews/Bitmaps/rmover.bm
-interviews/include/InterViews/Bitmaps/rmoverHit.bm
-interviews/include/InterViews/Bitmaps/rmoverMask.bm
-interviews/include/InterViews/Bitmaps/rufast.bm
-interviews/include/InterViews/Bitmaps/rufastMask.bm
-interviews/include/InterViews/Bitmaps/ufast.bm
-interviews/include/InterViews/Bitmaps/ufastMask.bm
-interviews/include/InterViews/Bitmaps/umover.bm
-interviews/include/InterViews/Bitmaps/umoverHit.bm
-interviews/include/InterViews/Bitmaps/umoverMask.bm
-interviews/include/OS/_defines.h
-interviews/include/OS/_undefs.h
-interviews/include/OS/directory.h
-interviews/include/OS/enter-scope.h
-interviews/include/OS/file.h
-interviews/include/OS/host.h
-interviews/include/OS/leave-scope.h
-interviews/include/OS/list.h
-interviews/include/OS/math.h
-interviews/include/OS/memory.h
-interviews/include/OS/os.h
-interviews/include/OS/string.h
-interviews/include/OS/table.h
-interviews/include/OS/table2.h
-interviews/include/OS/types.h
-interviews/include/OS/ustring.h
-interviews/include/Unidraw/_defines.h
-interviews/include/Unidraw/_undefs.h
-interviews/include/Unidraw/catalog.h
-interviews/include/Unidraw/classes.h
-interviews/include/Unidraw/clipboard.h
-interviews/include/Unidraw/creator.h
-interviews/include/Unidraw/ctrlinfo.h
-interviews/include/Unidraw/dialogs.h
-interviews/include/Unidraw/editor.h
-interviews/include/Unidraw/editorinfo.h
-interviews/include/Unidraw/enter-scope.h
-interviews/include/Unidraw/globals.h
-interviews/include/Unidraw/grid.h
-interviews/include/Unidraw/iterator.h
-interviews/include/Unidraw/keymap.h
-interviews/include/Unidraw/kybd.h
-interviews/include/Unidraw/leave-scope.h
-interviews/include/Unidraw/manip.h
-interviews/include/Unidraw/manips.h
-interviews/include/Unidraw/path.h
-interviews/include/Unidraw/selection.h
-interviews/include/Unidraw/statevar.h
-interviews/include/Unidraw/statevars.h
-interviews/include/Unidraw/stateview.h
-interviews/include/Unidraw/stateviews.h
-interviews/include/Unidraw/transfn.h
-interviews/include/Unidraw/transfns.h
-interviews/include/Unidraw/uarray.h
-interviews/include/Unidraw/uctrl.h
-interviews/include/Unidraw/uctrls.h
-interviews/include/Unidraw/uformat.h
-interviews/include/Unidraw/uhash.h
-interviews/include/Unidraw/ulist.h
-interviews/include/Unidraw/umap.h
-interviews/include/Unidraw/unidraw.h
-interviews/include/Unidraw/upage.h
-interviews/include/Unidraw/viewer.h
-interviews/include/Unidraw/Components/cglue.h
-interviews/include/Unidraw/Components/component.h
-interviews/include/Unidraw/Components/compview.h
-interviews/include/Unidraw/Components/connector.h
-interviews/include/Unidraw/Components/csolver.h
-interviews/include/Unidraw/Components/ellipse.h
-interviews/include/Unidraw/Components/externview.h
-interviews/include/Unidraw/Components/grcomp.h
-interviews/include/Unidraw/Components/grview.h
-interviews/include/Unidraw/Components/gvupdater.h
-interviews/include/Unidraw/Components/line.h
-interviews/include/Unidraw/Components/link.h
-interviews/include/Unidraw/Components/pad.h
-interviews/include/Unidraw/Components/pin.h
-interviews/include/Unidraw/Components/polygon.h
-interviews/include/Unidraw/Components/psformat.h
-interviews/include/Unidraw/Components/psview.h
-interviews/include/Unidraw/Components/rastercomp.h
-interviews/include/Unidraw/Components/rect.h
-interviews/include/Unidraw/Components/slot.h
-interviews/include/Unidraw/Components/spline.h
-interviews/include/Unidraw/Components/stencilcomp.h
-interviews/include/Unidraw/Components/text.h
-interviews/include/Unidraw/Components/vertices.h
-interviews/include/Unidraw/Commands/align.h
-interviews/include/Unidraw/Commands/brushcmd.h
-interviews/include/Unidraw/Commands/catcmds.h
-interviews/include/Unidraw/Commands/colorcmd.h
-interviews/include/Unidraw/Commands/command.h
-interviews/include/Unidraw/Commands/data.h
-interviews/include/Unidraw/Commands/datas.h
-interviews/include/Unidraw/Commands/edit.h
-interviews/include/Unidraw/Commands/font.h
-interviews/include/Unidraw/Commands/import.h
-interviews/include/Unidraw/Commands/macro.h
-interviews/include/Unidraw/Commands/nop.h
-interviews/include/Unidraw/Commands/patcmd.h
-interviews/include/Unidraw/Commands/struct.h
-interviews/include/Unidraw/Commands/transforms.h
-interviews/include/Unidraw/Commands/viewcmds.h
-interviews/include/Unidraw/Graphic/damage.h
-interviews/include/Unidraw/Graphic/ellipses.h
-interviews/include/Unidraw/Graphic/geomobjs.h
-interviews/include/Unidraw/Graphic/graphic.h
-interviews/include/Unidraw/Graphic/grblock.h
-interviews/include/Unidraw/Graphic/lines.h
-interviews/include/Unidraw/Graphic/picture.h
-interviews/include/Unidraw/Graphic/polygons.h
-interviews/include/Unidraw/Graphic/pspaint.h
-interviews/include/Unidraw/Graphic/rasterrect.h
-interviews/include/Unidraw/Graphic/splines.h
-interviews/include/Unidraw/Graphic/ulabel.h
-interviews/include/Unidraw/Graphic/ustencil.h
-interviews/include/Unidraw/Graphic/util.h
-interviews/include/Unidraw/Graphic/verts.h
-interviews/include/Unidraw/Tools/connect.h
-interviews/include/Unidraw/Tools/grcomptool.h
-interviews/include/Unidraw/Tools/magnify.h
-interviews/include/Unidraw/Tools/move.h
-interviews/include/Unidraw/Tools/reshape.h
-interviews/include/Unidraw/Tools/rotate.h
-interviews/include/Unidraw/Tools/scale.h
-interviews/include/Unidraw/Tools/select.h
-interviews/include/Unidraw/Tools/stretch.h
-interviews/include/Unidraw/Tools/tool.h
-interviews/lib/libIV.so.3.1
-interviews/lib/libUnidraw.so.3.1
-interviews/lib/all/app-defaults/Doc
-interviews/lib/all/app-defaults/InterViews
-interviews/lib/all/app-defaults/Idemo
-interviews/lib/all/app-defaults/idraw
-interviews/lib/all/doc-samples/intro.doc
-interviews/lib/all/doc-samples/slides.doc
-interviews/lib/all/doc-samples/uist.doc
-interviews/lib/all/doc-samples/car.ips
-interviews/lib/all/doc-samples/flag.oz.ips
-interviews/lib/all/doc-samples/objects.ips
-interviews/lib/all/drawings/car
-interviews/lib/all/drawings/car.bw
-interviews/lib/all/drawings/cis
-interviews/lib/all/drawings/ducks
-interviews/lib/all/drawings/flags
-interviews/lib/all/drawings/pepsi
-interviews/lib/all/drawings/qbf
-interviews/lib/all/drawings/workstation
-interviews/lib/all/ibuild-samples/README
-interviews/lib/all/ibuild-samples/Clock/Clock.c
-interviews/lib/all/ibuild-samples/Clock/Clock.h
-interviews/lib/all/ibuild-samples/Clock/Dial.c
-interviews/lib/all/ibuild-samples/Clock/Dial.h
-interviews/lib/all/ibuild-samples/Clock/clock-main.c
-interviews/lib/all/ibuild-samples/Clock/clock
-interviews/lib/all/ibuild-samples/Grapher/Grapher.c
-interviews/lib/all/ibuild-samples/Grapher/Grapher.h
-interviews/lib/all/ibuild-samples/Grapher/Plotter.c
-interviews/lib/all/ibuild-samples/Grapher/Plotter.h
-interviews/lib/all/ibuild-samples/Grapher/grapher-main.c
-interviews/lib/all/ibuild-samples/Grapher/grapher
-interviews/lib/all/ibuild-samples/Meter/Meter.c
-interviews/lib/all/ibuild-samples/Meter/Meter.h
-interviews/lib/all/ibuild-samples/Meter/meter
-interviews/lib/all/ibuild-samples/Pie/Pie.c
-interviews/lib/all/ibuild-samples/Pie/Pie.h
-interviews/lib/all/ibuild-samples/Pie/pie-main.c
-interviews/lib/all/ibuild-samples/Pie/pie
-interviews/lib/all/ibuild-samples/Punidraw/punidraw
-interviews/lib/all/ibuild-samples/Sted/OpenDialog.c
-interviews/lib/all/ibuild-samples/Sted/OpenDialog.h
-interviews/lib/all/ibuild-samples/Sted/SaveDialog.c
-interviews/lib/all/ibuild-samples/Sted/SaveDialog.h
-interviews/lib/all/ibuild-samples/Sted/SearchDialog.c
-interviews/lib/all/ibuild-samples/Sted/SearchDialog.h
-interviews/lib/all/ibuild-samples/Sted/Sted.c
-interviews/lib/all/ibuild-samples/Sted/Sted.h
-interviews/lib/all/ibuild-samples/Sted/sted
-interviews/lib/all/ibuild-samples/Sted/sted-main.c
-interviews/lib/all/ibuild-samples/VMouse/VMouse.c
-interviews/lib/all/ibuild-samples/VMouse/VMouse.h
-interviews/lib/all/ibuild-samples/VMouse/vmouse-main.c
-interviews/lib/all/ibuild-samples/VMouse/vmouse
-interviews/lib/all/ibuild-samples/VWork/VWork.c
-interviews/lib/all/ibuild-samples/VWork/VWork.h
-interviews/lib/all/ibuild-samples/VWork/vwork
-interviews/lib/all/images/jello.tif
-interviews/lib/all/images/linton.tif
-interviews/lib/all/logos/iv
-interviews/lib/all/logos/iv.OK
-interviews/lib/all/logos/iv.TV
-interviews/lib/all/logos/iv.X
-interviews/lib/all/logos/iv.bite
-interviews/lib/all/logos/iv.bits
-interviews/lib/all/logos/iv.bomb
-interviews/lib/all/logos/iv.boom
-interviews/lib/all/logos/iv.boot
-interviews/lib/all/logos/iv.bug
-interviews/lib/all/logos/iv.build
-interviews/lib/all/logos/iv.burn
-interviews/lib/all/logos/iv.chip
-interviews/lib/all/logos/iv.collapse
-interviews/lib/all/logos/iv.desk
-interviews/lib/all/logos/iv.die
-interviews/lib/all/logos/iv.die.gray
-interviews/lib/all/logos/iv.egg
-interviews/lib/all/logos/iv.fade
-interviews/lib/all/logos/iv.flag
-interviews/lib/all/logos/iv.flip
-interviews/lib/all/logos/iv.hang
-interviews/lib/all/logos/iv.holes
-interviews/lib/all/logos/iv.house
-interviews/lib/all/logos/iv.ivy
-interviews/lib/all/logos/iv.no
-interviews/lib/all/logos/iv.patch
-interviews/lib/all/logos/iv.pbomb
-interviews/lib/all/logos/iv.pbug
-interviews/lib/all/logos/iv.peel
-interviews/lib/all/logos/iv.persp
-interviews/lib/all/logos/iv.scan
-interviews/lib/all/logos/iv.scroll
-interviews/lib/all/logos/iv.shade
-interviews/lib/all/logos/iv.shuffle
-interviews/lib/all/logos/iv.spider
-interviews/lib/all/logos/iv.tank
-interviews/lib/all/logos/iv.tomb
-interviews/lib/all/logos/iv.trash
-interviews/lib/all/logos/iv.tree
-interviews/lib/all/logos/iv.warp
-interviews/lib/all/logos/iv.window
-interviews/lib/all/logos/iv.world
-interviews/lib/all/styles/10pt.sty
-interviews/lib/all/styles/12pt.sty
-interviews/lib/all/styles/14pt.sty
-interviews/lib/all/styles/18pt.sty
-interviews/lib/all/styles/24pt.sty
-interviews/lib/all/styles/8pt.sty
-interviews/lib/all/styles/article.sty
-interviews/lib/all/styles/book.sty
-interviews/lib/all/styles/helvetica.sty
-interviews/lib/all/styles/largepage.sty
-interviews/lib/all/styles/letter.sty
-interviews/lib/all/styles/mediumpage.sty
-interviews/lib/all/styles/report.sty
-interviews/lib/all/styles/slides.sty
-interviews/lib/all/styles/smallpage.sty
-interviews/lib/all/styles/thesis.sty
-interviews/lib/all/styles/times.sty
-interviews/bin/alert
-interviews/bin/dclock
-interviews/bin/doc
-interviews/bin/ibuild
-interviews/bin/iclass
-interviews/bin/idemo
-interviews/bin/idraw
-interviews/bin/ifc
-interviews/bin/logo
-interviews/bin/mailbox
-interviews/bin/cpu
-interviews/bin/ibmkmf
-interviews/bin/ivmkmf
-interviews/bin/remind
-interviews/man/refman.PS
-lib/libIV.so
-lib/libIV.so.3.1
-lib/libUnidraw.so
-lib/libUnidraw.so.3.1
-@dirrm interviews/bin
-@dirrm interviews/config/InterViews
-@dirrm interviews/config
-@dirrm interviews/include/Dispatch
-@dirrm interviews/include/IV-2_6/InterViews
-@dirrm interviews/include/IV-2_6
-@dirrm interviews/include/IV-X11
-@dirrm interviews/include/IV-look
-@dirrm interviews/include/InterViews/Bitmaps
-@dirrm interviews/include/InterViews
-@dirrm interviews/include/OS
-@dirrm interviews/include/Unidraw/Commands
-@dirrm interviews/include/Unidraw/Components
-@dirrm interviews/include/Unidraw/Graphic
-@dirrm interviews/include/Unidraw/Tools
-@dirrm interviews/include/Unidraw
-@dirrm interviews/include
-@dirrm interviews/lib/all/app-defaults
-@dirrm interviews/lib/all/doc-samples
-@dirrm interviews/lib/all/drawings
-@dirrm interviews/lib/all/ibuild-samples/Clock
-@dirrm interviews/lib/all/ibuild-samples/Grapher
-@dirrm interviews/lib/all/ibuild-samples/Meter
-@dirrm interviews/lib/all/ibuild-samples/Pie
-@dirrm interviews/lib/all/ibuild-samples/Punidraw
-@dirrm interviews/lib/all/ibuild-samples/Sted
-@dirrm interviews/lib/all/ibuild-samples/VMouse
-@dirrm interviews/lib/all/ibuild-samples/VWork
-@dirrm interviews/lib/all/ibuild-samples
-@dirrm interviews/lib/all/images
-@dirrm interviews/lib/all/logos
-@dirrm interviews/lib/all/styles
-@dirrm interviews/lib/all
-@dirrm interviews/lib
-@dirrm interviews/man/mann
-@dirrm interviews/man
-@dirrm interviews
diff --git a/japanese/iv/scripts/configure b/japanese/iv/scripts/configure
deleted file mode 100644
index 018fe0d26437..000000000000
--- a/japanese/iv/scripts/configure
+++ /dev/null
@@ -1,16 +0,0 @@
-#! /bin/sh
-
-cd ${WRKSRC}
-
-localconfig=src/config/InterViews/local.def
-
-sed	-e "s:/usr/local/interviews:${PREFIX}/interviews:" \
-	-e "s:/usr/X11R6:${X11BASE}:" \
-	${localconfig} > ${localconfig}.new
-mv -f ${localconfig}.new ${localconfig}
-
-CPU=`make CPU`; export CPU
-make Makefile XCONFIGDIR=${X11BASE}/lib/X11/config
-make Makefiles
-make depend
-
diff --git a/japanese/mozilla-jlp-devel/Makefile b/japanese/mozilla-jlp-devel/Makefile
deleted file mode 100644
index dfebec6a3b5f..000000000000
--- a/japanese/mozilla-jlp-devel/Makefile
+++ /dev/null
@@ -1,74 +0,0 @@
-# New ports collection makefile for:	ja-mozilla-jlp-devel
-# Date created:		02 Jul 2000
-# Whom:			Yoichi ASAI <yatt@luna2.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	mozilla
-PORTVERSION=	1.8.b1
-PORTREVISION=	1
-CATEGORIES=	japanese www
-MASTER_SITES=	ftp://ftp.mozilla-japan.org/pub/mozilla-japan/mozilla/development/1.8b1/
-PKGNAMESUFFIX=	-jlp
-DISTNAME=	mozilla-1.8b1-langjajp-1
-EXTRACT_SUFX=	.xpi
-
-MAINTAINER=	fortune@n.jpn.ph
-COMMENT=	Mozilla Japanese Language Pack (JLP)
-
-BUILD_DEPENDS=	${X11BASE}/lib/${MOZILLA}/regxpcom:${PORTSDIR}/www/${MOZILLA}
-RUN_DEPENDS=	${MOZILLA}:${PORTSDIR}/www/${MOZILLA} \
-		${PKG_DBDIR}/ja-alias-fonts-1.0:${PORTSDIR}/japanese/alias-fonts
-
-BROKEN=		Incorrect pkg-plist
-DEPRECATED=	${BROKEN}
-EXPIRATION_DATE=2005-09-22
-
-WRKSRC=		${WRKDIR}/bin
-
-LATEST_LINK=	ja-mozilla-jlp-devel
-USE_X_PREFIX=	yes
-USE_ZIP=	yes
-EXTRACT_BEFORE_ARGS=	-qo
-
-MOZILLA=	mozilla-devel
-PLIST_SUB=	MOZILLA=${MOZILLA}
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 450002
-LOCALENAME=	ja_JP.eucJP
-.elif ${OSVERSION} >= 400020
-LOCALENAME=	ja_JP.EUC
-.else
-LOCALENAME=	ja_JP.EUC
-.endif
-
-do-build:
-	${SED} -e "s^%%PREFIX%%^${PREFIX}^g" \
-	       -e "s^%%LOCALBASE%%^${LOCALBASE}^g" \
-	       -e "s^%%LOCALENAME%%^${LOCALENAME}^g" \
-	       -e "s^%%MOZILLA%%^${MOZILLA}^g" \
-	${FILESDIR}/mozilla.sh > ${WRKDIR}/${MOZILLA}
-
-do-install:
-	(cd ${PREFIX}/lib/${MOZILLA}/chrome; \
-	${MV} -f installed-chrome.txt installed-chrome.txt.orig)
-	${MV} -f ${PREFIX}/bin/${MOZILLA} ${PREFIX}/bin/${MOZILLA}.orig
-	${INSTALL_SCRIPT} ${WRKDIR}/${MOZILLA} ${PREFIX}/bin
-	(cd ${WRKDIR}/sp; ${TAR} -cf - *) | \
-	${TAR} -xf - -C ${PREFIX}/lib/${MOZILLA}/searchplugins
-#	(cd ${WRKDIR}/sp_nomac; ${TAR} -cf - *) | \
-#	${TAR} -xf - -C ${PREFIX}/lib/${MOZILLA}/searchplugins
-	(cd ${WRKSRC}; ${TAR} -cf - chrome defaults) | \
-	${TAR} -xf - -C ${PREFIX}/lib/${MOZILLA}
-	(cd ${PREFIX}/lib/${MOZILLA}/chrome; \
-	${CP} installed-chrome.txt.orig installed-chrome.txt; \
-	${CAT} ${FILESDIR}/installed-chrome.txt >> installed-chrome.txt)
-	(cd ${PREFIX}/lib/${MOZILLA}; \
-	${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. ./regxpcom; \
-	${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. ./regchrome)
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.post.mk>
diff --git a/japanese/mozilla-jlp-devel/distinfo b/japanese/mozilla-jlp-devel/distinfo
deleted file mode 100644
index 9276ec92ed95..000000000000
--- a/japanese/mozilla-jlp-devel/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (mozilla-1.8b1-langjajp-1.xpi) = b89d2435227ce041c848640837f2cd27
-SIZE (mozilla-1.8b1-langjajp-1.xpi) = 637218
diff --git a/japanese/mozilla-jlp-devel/files/installed-chrome.txt b/japanese/mozilla-jlp-devel/files/installed-chrome.txt
deleted file mode 100644
index 470594ef6b60..000000000000
--- a/japanese/mozilla-jlp-devel/files/installed-chrome.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/global/
-locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/communicator/
-locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/messenger/
-locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/editor/
-locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/navigator/
-locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/necko/
-locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/p3p/
-locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/cookie/
-locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/wallet/
-locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/pipnss/
-locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/pippki/
-locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/content-packs/
-locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/help/
-locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/mozldap/
-locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/forms/
-locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/forms/
-locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/autoconfig/
-locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/messenger-smime/
-locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/messenger-mdn/
-locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/messenger-mapi/
-locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/chatzilla/
-locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/venkman/
-locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/inspector/
-locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/sroaming/
-locale,install,url,jar:resource:/chrome/ja-JP.jar!/locale/ja-JP/tasks/
-locale,install,url,jar:resource:/chrome/ja-unix.jar!/locale/ja-JP/global-platform/
-locale,install,url,jar:resource:/chrome/ja-unix.jar!/locale/ja-JP/communicator-platform/
-locale,install,url,jar:resource:/chrome/ja-unix.jar!/locale/ja-JP/navigator-platform/
-locale,install,url,jar:resource:/chrome/JP.jar!/locale/JP/global-region/
-locale,install,url,jar:resource:/chrome/JP.jar!/locale/JP/communicator-region/
-locale,install,url,jar:resource:/chrome/JP.jar!/locale/JP/editor-region/
-locale,install,url,jar:resource:/chrome/JP.jar!/locale/JP/messenger-region/
-locale,install,url,jar:resource:/chrome/JP.jar!/locale/JP/navigator-region/
-locale,install,select,ja-JP
-locale,install,select,JP
diff --git a/japanese/mozilla-jlp-devel/files/mozilla.sh b/japanese/mozilla-jlp-devel/files/mozilla.sh
deleted file mode 100644
index b5a015c99c7c..000000000000
--- a/japanese/mozilla-jlp-devel/files/mozilla.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-
-LANG=%%LOCALENAME%%; export LANG
-#XMODIFIERS=@im=kinput2; export XMODIFIERS
-#LD_PRELOAD=%%LOCALBASE%%/lib/libflashplayer.so.1; export LD_PRELOAD
-
-MOZILLA_DIR="%%PREFIX%%/lib/%%MOZILLA%%"
-MOZILLA_EXEC="mozilla"
-LOCATION='new-tab'
-
-cd $MOZILLA_DIR                                     || exit 1
-
-case $1 in
-    -mail)
-    	REMOTE_COMMAND="xfeDoCommand (openInbox)"
-	;;
-    -*)
-    	exec ./$MOZILLA_EXEC "$@"
-	;;
-    *)
-    	REMOTE_COMMAND="openURL($@, $LOCATION)"
-	;;
-esac
-    
-# process found
-./$MOZILLA_EXEC -remote "ping()"                    &&
-./$MOZILLA_EXEC -remote "$REMOTE_COMMAND"           && exit 0
-
-# no existing process
-exec ./$MOZILLA_EXEC "$@"
-
diff --git a/japanese/mozilla-jlp-devel/pkg-descr b/japanese/mozilla-jlp-devel/pkg-descr
deleted file mode 100644
index 65c1e3c87cde..000000000000
--- a/japanese/mozilla-jlp-devel/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-Mozilla is an open-source application suite for web browsing, email,
-HTML editing, IRC chat, and more.
-
-Mozilla Japanese Language Pack (JLP) provides Japanese localized
-resource for Mozilla.
-
-WWW: http://www33.ocn.ne.jp/~snip/mozilla/
diff --git a/japanese/mozilla-jlp-devel/pkg-message b/japanese/mozilla-jlp-devel/pkg-message
deleted file mode 100644
index 304e334ad6a6..000000000000
--- a/japanese/mozilla-jlp-devel/pkg-message
+++ /dev/null
@@ -1,10 +0,0 @@
-********************************
-If your XIM wouldn't work properly, try to make a file
-
-"${HOME}/.mozilla/${USER}/*.slt/user.js"
-
-with below content;
---
-user_pref("xim.input_style", "over-the-spot")
---
-********************************
diff --git a/japanese/mozilla-jlp-devel/pkg-plist b/japanese/mozilla-jlp-devel/pkg-plist
deleted file mode 100644
index 225e7139fb56..000000000000
--- a/japanese/mozilla-jlp-devel/pkg-plist
+++ /dev/null
@@ -1,45 +0,0 @@
-@exec mv %D/bin/%%MOZILLA%% %D/bin/%%MOZILLA%%.orig
-@exec mv %D/lib/%%MOZILLA%%/chrome/installed-chrome.txt %D/lib/%%MOZILLA%%/chrome/installed-chrome.txt.orig
-bin/%%MOZILLA%%
-lib/%%MOZILLA%%/chrome/JP.jar
-lib/%%MOZILLA%%/chrome/chrome.rdf
-lib/%%MOZILLA%%/chrome/installed-chrome.txt
-lib/%%MOZILLA%%/chrome/ja-JP.jar
-lib/%%MOZILLA%%/chrome/ja-mac.jar
-lib/%%MOZILLA%%/chrome/ja-unix.jar
-lib/%%MOZILLA%%/chrome/ja-win.jar
-lib/%%MOZILLA%%/components/xpti.dat
-lib/%%MOZILLA%%/defaults/messenger/JP/mailViews.dat
-lib/%%MOZILLA%%/defaults/profile/JP/chrome/userChrome-example.css
-lib/%%MOZILLA%%/defaults/profile/JP/chrome/userContent-example.css
-lib/%%MOZILLA%%/defaults/profile/JP/chrome/userChrome-example-euc.css
-lib/%%MOZILLA%%/defaults/profile/JP/chrome/userChrome-example-sjis.css
-lib/%%MOZILLA%%/defaults/profile/JP/chrome/userContent-example-euc.css
-lib/%%MOZILLA%%/defaults/profile/JP/chrome/userContent-example-sjis.css
-lib/%%MOZILLA%%/defaults/profile/JP/bookmarks.html
-lib/%%MOZILLA%%/defaults/profile/JP/localstore.rdf
-lib/%%MOZILLA%%/defaults/profile/JP/mimeTypes.rdf
-lib/%%MOZILLA%%/defaults/profile/JP/panels.rdf
-lib/%%MOZILLA%%/defaults/profile/JP/prefs.js
-lib/%%MOZILLA%%/defaults/profile/JP/search.rdf
-lib/%%MOZILLA%%/searchplugins/amazon-ja.src
-lib/%%MOZILLA%%/searchplugins/amazon-ja.png
-lib/%%MOZILLA%%/searchplugins/google-ja.src
-lib/%%MOZILLA%%/searchplugins/google-ja.gif
-lib/%%MOZILLA%%/searchplugins/google_news.src
-lib/%%MOZILLA%%/searchplugins/google_news.gif
-lib/%%MOZILLA%%/searchplugins/kakaku.src
-lib/%%MOZILLA%%/searchplugins/kakaku.png
-lib/%%MOZILLA%%/searchplugins/mozillazine-ja.src
-lib/%%MOZILLA%%/searchplugins/mozillazine-ja.png
-lib/%%MOZILLA%%/searchplugins/wikipedia-ja.src
-lib/%%MOZILLA%%/searchplugins/wikipedia-ja.png
-lib/%%MOZILLA%%/searchplugins/yahoo-ja.src
-lib/%%MOZILLA%%/searchplugins/yahoo-ja.png
-lib/%%MOZILLA%%/searchplugins/wni.src
-lib/%%MOZILLA%%/searchplugins/wni.png
-@unexec mv %D/bin/%%MOZILLA%%.orig %D/bin/%%MOZILLA%%
-@unexec mv %D/lib/%%MOZILLA%%/chrome/installed-chrome.txt.orig %D/lib/%%MOZILLA%%/chrome/installed-chrome.txt
-@dirrm lib/%%MOZILLA%%/defaults/profile/JP/chrome
-@dirrm lib/%%MOZILLA%%/defaults/profile/JP
-@dirrm lib/%%MOZILLA%%/defaults/messenger/JP
diff --git a/japanese/openoffice-templates/Makefile b/japanese/openoffice-templates/Makefile
deleted file mode 100644
index 8dc5953e995f..000000000000
--- a/japanese/openoffice-templates/Makefile
+++ /dev/null
@@ -1,123 +0,0 @@
-# New ports collection makefile for:	ja-openoffice-templates
-# Date created:				2003/10/10
-# Whom:					nork@FreeBSD.org
-#
-# $FreeBSD$
-#
-
-PORTNAME=	templates
-PORTVERSION=	${OPENOFFICE.ORG_VER}.20041007
-PORTREVISION=	2
-CATEGORIES=	japanese editors
-MASTER_SITES=	http://ooosupport.good-day.net/
-PKGNAMEPREFIX=	ja-openoffice.org-
-DIST_SUBDIR?=	openoffice.org1.1
-DISTNAME=	impress_${PORTNAME}
-
-MAINTAINER=	openoffice@FreeBSD.org
-COMMENT=	OpenOffice.org 1.1 Impress Templates
-
-RUN_DEPENDS=	${LOCALBASE}/${OPENOFFICE.ORG}/program/soffice:${PORTSDIR}/editors/openoffice.org-1.1
-
-BROKEN=		Install fails
-DEPRECATED=	${BROKEN}
-EXPIRATION_DATE=2005-09-22
-
-NO_BUILD=	yes
-PLIST_FILES=	${OOTEMPLATES:S|^|${TEMPLATEDIR}/|}
-
-OPENOFFICE.ORG=	OpenOffice.org${OPENOFFICE_VER}
-OPENOFFICE.ORG_VER=	1.1.5
-TEMPLATEDIR=	${OPENOFFICE.ORG}/share/template/japanese/layout
-
-OOOTEMPLATES=	\
-		A4-kariert.sti			\
-		Black-cyan-yellow.ja.sti	\
-		Black-orange.ja.sti		\
-		Blue-yellow-white.ja.sti	\
-		BlueBoxes_ja_11.sti		\
-		BlueSilver_ja_11.sti		\
-		BlueWavesTempl-1_ja_11.sti	\
-		Blue_Circles_ja_11.sti		\
-		Blue_Lines.sti			\
-		Butterflies.sti			\
-		Candy.ja.sti			\
-		Cheesy.ja.sti			\
-		Cubes_1x_ja_11.sti		\
-		DABlueChecker.sti		\
-		DABlueCircle.sti		\
-		DABlueCloud.sti			\
-		DABlueStars.sti			\
-		DABlueWhiteFlower.sti		\
-		DALetters.sti			\
-		DAMultiStars2.sti		\
-		DAOrangeTexture.sti		\
-		DAPinkCloud.sti			\
-		DASnowFlacks.sti		\
-		DASparkle.sti			\
-		Foot-prints.ja.sti		\
-		Foral-StudioA02.sti		\
-		Foral-Studio_A01.sti		\
-		Grad-blue.ja.sti		\
-		Grad-blue_2.ja.sti		\
-		Grad-blue_3.ja.sti		\
-		Grad-cyan-black.ja.sti		\
-		Grad-gray-blue.ja.sti		\
-		Grad-lightblue.ja.sti		\
-		Grad-lightblue_2.ja.sti		\
-		Grad-mediumblue.ja.sti		\
-		Grad-purple.ja.sti		\
-		Gray-green.ja.sti		\
-		Hatch_ja_11.sti			\
-		Marble.ja.sti			\
-		MarbleTempl-2_ja_11.sti		\
-		Music.ja.sti			\
-		Notepad_ja_11.sti		\
-		OOo.sti				\
-		OOo2.sti			\
-		Ortra_ja_11.sti			\
-		Pixels.ja.sti			\
-		Roses.ja.sti			\
-		Solar_ja_11.sti			\
-		Sunburst_ja_11.sti		\
-		White-blue.ja.sti		\
-		White-blue_sky.ja.sti		\
-		White-red.ja.sti		\
-		White-red_2.ja.sti		\
-		White-red_3.ja.sti		\
-		With-year-2003.ja.sti		\
-		With-year-2004.ja.sti		\
-		With-year-2005.ja.sti		\
-		With-years.ja.sti		\
-		blue.sti			\
-		bluesquares.sti			\
-		coolblack.sti			\
-		coolspace.sti			\
-		earthlight.sti			\
-		jp-temple.sti			\
-		kamometemplate.sti		\
-		karteikarte.sti			\
-		lamp.sti			\
-		landscape.sti			\
-		lay_wood.sti			\
-		mondo_cyan.sti			\
-		mondo_green.sti			\
-		mondo_yellow.sti		\
-		ooo_blue.sti			\
-		ooo_red.sti			\
-		openblue.sti			\
-		redStar.sti			\
-		relief.sti			\
-		sidepanel_blue.sti		\
-		sidepanel_cloud.sti		\
-		sidepanel_green.sti		\
-		sidepanel_red.sti		\
-		sun4.sti			\
-		templatecopyright
-
-do-install:
-.for FILE in ${OOOTEMPLATES}
-	@${INSTALL_DATA} ${WRKSRC}/${FILE} ${PREFIX}/${TEMPLATEDIR}/${FILE}
-.endfor
-
-.include <bsd.port.mk>
diff --git a/japanese/openoffice-templates/distinfo b/japanese/openoffice-templates/distinfo
deleted file mode 100644
index ca6412457088..000000000000
--- a/japanese/openoffice-templates/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (openoffice1.1/impress_templates.tar.gz) = ac66b343103168c6a8701039b707411f
-SIZE (openoffice1.1/impress_templates.tar.gz) = 4573924
diff --git a/japanese/openoffice-templates/pkg-descr b/japanese/openoffice-templates/pkg-descr
deleted file mode 100644
index 94250cfede9d..000000000000
--- a/japanese/openoffice-templates/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Templates for OpenOffice.org Impress.
-
-WWW: http://desktop.good-day.net/ooo11/tmp.php
diff --git a/japanese/pgp.language/Makefile b/japanese/pgp.language/Makefile
deleted file mode 100644
index 58c7234e0a30..000000000000
--- a/japanese/pgp.language/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-# New ports collection makefile for: pgp.language (japanese)
-# Date created:         9 May 1997
-# Whom:                 Hironori Ikura <hikura@kaisei.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	pgp
-PORTVERSION=	2.6.3
-CATEGORIES=	japanese security
-MASTER_SITES=	ftp://ftp.ifi.uio.no/pub/pgp/2.x/lang/
-DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}i-japanese
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Japanese language module for PGP
-
-DEPRECATED=		obsolete -- current version of base program is 7.0
-EXPIRATION_DATE=	2005-10-11
-
-RUN_DEPENDS=	pgp:${PORTSDIR}/security/pgp
-
-USE_ZIP=	YES
-NO_BUILD=	YES
-
-# version and language specifications
-PGP_LANGUAGE=	japanese
-PGP_LANG=	ja
-PGP_CHARSET=	noconv
-
-PGPLIB=		${PREFIX}/share/pgp
-OBJS=		language.txt ${PGP_LANG}.hlp README.${PGP_LANG}
-
-do-install:
-	-[ -d ${PGPLIB} ] || { \
-		${MKDIR} ${PGPLIB} ; \
-		${CHOWN} bin:bin ${PGPLIB} ; \
-		${CHMOD} 555 ${PGPLIB} ; }
-	-[ -f ${PGPLIB}/language.txt ] && \
-		${MV} ${PGPLIB}/language.txt ${PGPLIB}/language.txt.bak
-	@cd ${WRKSRC}; \
-		${INSTALL_DATA} ${OBJS} ${PGPLIB}; \
-		${INSTALL_DATA} memo ${PGPLIB}/memo.ja
-	@cd ${PGPLIB}; \
-		${GREP} -l -q '^Language.*=.*${PGP_LANG}' config.txt || \
-		${SH} ${SCRIPTDIR}/pgp.config.l10n.sh \
-			${PGPLIB} ${PGP_LANG} ${PGP_CHARSET}
-	-pgp > /dev/null  2>&1  # update .idx file
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.mk>
diff --git a/japanese/pgp.language/distinfo b/japanese/pgp.language/distinfo
deleted file mode 100644
index 42e8a47d3e8f..000000000000
--- a/japanese/pgp.language/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (pgp263i-japanese.zip) = 318891983d6bf76a4ab5b538656a5e01
-SIZE (pgp263i-japanese.zip) = 21481
diff --git a/japanese/pgp.language/pkg-descr b/japanese/pgp.language/pkg-descr
deleted file mode 100644
index 2275b3b14c78..000000000000
--- a/japanese/pgp.language/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-Japanese language module for PGP 2.6.3ia.
-
- This package depends on original PGP 2.6.3ia (International version),
-and replaces some distributed files.
-(config.txt is modified, language.txt is replaced.)
diff --git a/japanese/pgp.language/pkg-message b/japanese/pgp.language/pkg-message
deleted file mode 100644
index 20a8ca5952ba..000000000000
--- a/japanese/pgp.language/pkg-message
+++ /dev/null
@@ -1,8 +0,0 @@
-**************************************************************
-*                      W a r n i n g                         *
-* This package included the limitation so called             *
-* ``HACKER IS NOT CRACKER'' restriction. Don't open this     *
-* package if you don't agree as to ``HACKER IS NOT CRACKER''.*
-* Read ``memo'' file to know more information.               *
-* ALL FILES ARE FOR JAPANESE LANGUAGE.                       *
-**************************************************************
diff --git a/japanese/pgp.language/pkg-plist b/japanese/pgp.language/pkg-plist
deleted file mode 100644
index 99b38b8c85ab..000000000000
--- a/japanese/pgp.language/pkg-plist
+++ /dev/null
@@ -1,10 +0,0 @@
-share/pgp/ja.hlp
-share/pgp/README.ja
-share/pgp/memo.ja
-@exec mv %D/share/pgp/config.txt %D/share/pgp/config.txt.bak
-share/pgp/config.txt
-@unexec mv %D/%F.bak %D/%F
-@exec mv %D/share/pgp/language.txt %D/share/pgp/language.txt.bak
-share/pgp/language.txt
-@unexec mv %D/%F.bak %D/%F
-share/pgp/language.idx
diff --git a/japanese/pgp.language/scripts/pgp.config.l10n.sh b/japanese/pgp.language/scripts/pgp.config.l10n.sh
deleted file mode 100644
index 0950b4a04df1..000000000000
--- a/japanese/pgp.language/scripts/pgp.config.l10n.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-#
-# pgp.config.l10n.sh  - modify PGP configuration file to localization.
-#
-#  Copyright(C) 1997  Hironori Ikura <hikura@tcc.co.jp>
-#
-# usage: pgp.config.l10n.sh <srcdir> <lang> <charset>
-# ex. pgp.config.l10n.sh /usr/ports/japanese/pgp/work ja noconv
-#
-
-if [ $# -ne 3 ]; then
-	echo "usage: $0 <srcdir> <lang> <charset>" 1>&2
-	echo "  ex. $0 /usr/ports/japanese/pgp/work ja noconv" 1>&2
-	exit 1
-fi
-
-wrkdir=$1
-lang=$2
-charset=$3
-config=$wrkdir/config.txt
-
-if [ ! -f "$config" ]; then
-	echo "No original config.txt is found." 1>&2
-	echo "Abort processing." 1>&2
-	exit 1
-fi
-
-mv $config $config.bak
-
-sed -e 's/^[Ll]anguage *= *[a-z][a-z]$/Language = '$lang'/' \
-    -e 's/^[ #]*CharSet *= *[A-Za-z0-9]*$/CharSet = '$charset'/' \
-	$config.bak > $config
-
-chown bin.bin $config
-chmod 444 $config
-
-exit 0
diff --git a/japanese/xemacs21-canna+freewnn/Makefile b/japanese/xemacs21-canna+freewnn/Makefile
deleted file mode 100644
index ee262e1255c6..000000000000
--- a/japanese/xemacs21-canna+freewnn/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# New ports collection makefile for:	XEmacs with Canna and FreeWnn
-# Date created:		5 Dec 1997
-# Whom:			KIRIYAMA Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
-#
-# $FreeBSD$
-#
-
-CATEGORIES=	japanese
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	XEmacs(stable version) text editor(SJ3, SKK, Canna and FreeWnn)
-
-MASTERDIR=	${.CURDIR}/../../editors/xemacs21-mule
-
-BROKEN=		Incomplete pkg-plist
-DEPRECATED=	${BROKEN}
-EXPIRATION_DATE=2005-09-22
-
-CANNA=		yes
-FREEWNN=	yes
-
-.include	"${MASTERDIR}/Makefile"
diff --git a/japanese/xemacs21-canna+wnn6/Makefile b/japanese/xemacs21-canna+wnn6/Makefile
deleted file mode 100644
index 07a7dd986d41..000000000000
--- a/japanese/xemacs21-canna+wnn6/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# New ports collection makefile for:	XEmacs with Canna and Wnn6
-# Date created:		5 Dec 1997
-# Whom:			KIRIYAMA Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
-#
-# $FreeBSD$
-#
-
-CATEGORIES=	japanese
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	XEmacs(stable version) text editor(SJ3, SKK, Canna and Wnn6)
-
-MASTERDIR=	${.CURDIR}/../../editors/xemacs21-mule
-
-BROKEN=		Incomplete pkg-plist
-DEPRECATED=	${BROKEN}
-EXPIRATION_DATE=2005-09-22
-
-CANNA=		yes
-WNN6=		yes
-
-.include	"${MASTERDIR}/Makefile"
diff --git a/japanese/xemacs21-canna/Makefile b/japanese/xemacs21-canna/Makefile
deleted file mode 100644
index 6270973bf873..000000000000
--- a/japanese/xemacs21-canna/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# New ports collection makefile for:	XEmacs for Japanese
-# Date created:		5 Dec 1997
-# Whom:			KIRIYAMA Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
-#
-# $FreeBSD$
-#
-
-CATEGORIES=	japanese
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	XEmacs(stable version) text editor(SJ3, SKK and Canna)
-
-MASTERDIR=	${.CURDIR}/../../editors/xemacs21-mule
-
-CANNA=		yes
-
-BROKEN=		"Incomplete pkg-plist"
-DEPRECATED=	${BROKEN}
-EXPIRATION_DATE=2005-09-22
-
-.include	"${MASTERDIR}/Makefile"
diff --git a/japanese/xemacs21-freewnn/Makefile b/japanese/xemacs21-freewnn/Makefile
deleted file mode 100644
index 5777096804af..000000000000
--- a/japanese/xemacs21-freewnn/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# New ports collection makefile for:	XEmacs with FreeWnn
-# Date created:		25 January 1998
-# Whom:			KIRIYAMA Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
-#
-# $FreeBSD$
-#
-
-CATEGORIES=	japanese
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	XEmacs(stable version) text editor(SJ3, SKK and FreeWnn)
-
-BROKEN=		Incomplete pkg-plist
-DEPRECATED=	${BROKEN}
-EXPIRATION_DATE=2005-09-22
-
-MASTERDIR=	${.CURDIR}/../../editors/xemacs21-mule
-
-FREEWNN=	yes
-
-.include	"${MASTERDIR}/Makefile"
diff --git a/japanese/xemacs21-wnn6/Makefile b/japanese/xemacs21-wnn6/Makefile
deleted file mode 100644
index a5d4b64fcab8..000000000000
--- a/japanese/xemacs21-wnn6/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# New ports collection makefile for:	XEmacs with Wnn6
-# Date created:		25 January 1998
-# Whom:			KIRIYAMA Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
-#
-# $FreeBSD$
-#
-
-
-CATEGORIES=	japanese
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	XEmacs(stable version) text editor(SJ3, SKK and Wnn6)
-
-BROKEN=		Incomplete pkg-plist
-DEPRECATED=	${BROKEN}
-EXPIRATION_DATE=2005-09-22
-
-MASTERDIR=	${.CURDIR}/../../editors/xemacs21-mule
-
-WNN6=		yes
-
-.include	"${MASTERDIR}/Makefile"
diff --git a/japanese/zope-zmilocalizer/Makefile b/japanese/zope-zmilocalizer/Makefile
deleted file mode 100644
index 69c24ecfd991..000000000000
--- a/japanese/zope-zmilocalizer/Makefile
+++ /dev/null
@@ -1,62 +0,0 @@
-# New ports collection makefile for:	ZMILocalizer
-# Date created:				18 November 2004
-# Whom:					Yasushi Hayashi
-#
-# $FreeBSD$
-#
-
-PORTNAME=	ZMILocalizer
-PORTVERSION=	0.8a
-CATEGORIES=	japanese www zope
-MASTER_SITES=	http://www.zope.co.jp/zj10n/
-DISTNAME=	zope10n08a
-EXTRACT_SUFX=	.tgz
-
-MAINTAINER=	yasi@yasi.to
-COMMENT=	Hotfix for www/zope to translate ZMI into Japanese
-
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/japanese.pth:${PORTSDIR}/japanese/pycodec \
-		${ZOPEBASEDIR}/${ZOPEPRODUCTDIR}/PlacelessTranslationService/__init__.py:${PORTSDIR}/www/zope-placelesstranslationservice
-
-BROKEN=		Broken dependency
-DEPRECATED=	${BROKEN}
-EXPIRATION_DATE=2005-09-22
-
-USE_PYTHON=	yes
-USE_ZOPE=	yes
-DIST_SUBDIR=	zope
-
-ZOPEPRODUCTNAME=	${PORTNAME}
-
-PLIST=		${WRKDIR}/pkg-plist
-WRKSRC=		${WRKDIR}/${DISTNAME}/${ZOPEPRODUCTNAME}
-
-.include <bsd.port.pre.mk>
-
-PKGNAMEPREFIX:=	${PKGNAMEPREFIX}zope-
-
-do-build:
-	-@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/
-
-pre-install:
-	@${RM} -f ${PLIST}
-	@${TOUCH} ${PLIST}
-	@cd ${WRKDIR}/${DISTNAME} ;\
-	for f in `${FIND} ${ZOPEPRODUCTNAME} -type f`; do \
-		${ECHO_CMD} %%ZOPEPRODUCTDIR%%/$${f} >> ${PLIST}; \
-	done; \
-	for d in `${FIND} -d ${ZOPEPRODUCTNAME} -type d`; do \
-		${ECHO_CMD} @dirrm %%ZOPEPRODUCTDIR%%/$${d} >> ${PLIST}; \
-	done; \
-
-do-install:
-	@${MKDIR} ${ZOPEBASEDIR}/${ZOPEPRODUCTDIR}/
-	@${CHMOD} -R og+rX ${WRKSRC}/
-	@${CP} -R ${WRKSRC} ${ZOPEBASEDIR}/${ZOPEPRODUCTDIR}/
-
-post-install:
-.if !defined(BATCH)
-	@${CAT} ${PKGMESSAGE}
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/japanese/zope-zmilocalizer/distinfo b/japanese/zope-zmilocalizer/distinfo
deleted file mode 100644
index 05c15f709fe7..000000000000
--- a/japanese/zope-zmilocalizer/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (zope/zope10n08a.tgz) = b3c572e73f4eefba2bdfda56bc78dd76
-SIZE (zope/zope10n08a.tgz) = 185111
diff --git a/japanese/zope-zmilocalizer/pkg-descr b/japanese/zope-zmilocalizer/pkg-descr
deleted file mode 100644
index 26d130c40436..000000000000
--- a/japanese/zope-zmilocalizer/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-This is a hotfix for Zope (www/zope), an object-based web application server.
-It translates Zope Management Interface into Japanese.
-
-WWW: http://www.zope.co.jp/zj10n/
-
--- Yasushi Hayashi
-yasi@yasi.to
diff --git a/japanese/zope-zmilocalizer/pkg-message b/japanese/zope-zmilocalizer/pkg-message
deleted file mode 100644
index 71cbde28c51c..000000000000
--- a/japanese/zope-zmilocalizer/pkg-message
+++ /dev/null
@@ -1,4 +0,0 @@
-To complete the installation of ZMI Localizer
-
-- Restart Zope.  This may be done from the Zope Control Panel.
-