summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--japanese/canna-lib/patches/patch-ae234
-rw-r--r--japanese/canna-lib/patches/patch-af13
-rw-r--r--japanese/canna-server/DESCR13
-rwxr-xr-xjapanese/canna-server/INSTALL7
-rw-r--r--japanese/canna-server/Makefile75
-rw-r--r--japanese/canna-server/PLIST70
-rw-r--r--japanese/canuum/DESCR1
-rw-r--r--japanese/canuum/Makefile41
-rw-r--r--japanese/canuum/PLIST3
-rw-r--r--japanese/canuum/distinfo10
-rw-r--r--japanese/canuum/patches/patch-aa91
-rw-r--r--japanese/canuum/patches/patch-ac40
-rw-r--r--japanese/canuum/patches/patch-ae89
-rw-r--r--japanese/canuum/patches/patch-af13
-rw-r--r--japanese/chasen-base/DESCR3
-rw-r--r--japanese/chasen-base/Makefile26
-rw-r--r--japanese/chasen-base/PLIST18
-rw-r--r--japanese/chasen-base/distinfo11
-rw-r--r--japanese/chasen-base/patches/patch-ag12
-rw-r--r--japanese/chasen-base/patches/patch-ah13
-rw-r--r--japanese/chasen-base/patches/patch-ai13
-rw-r--r--japanese/chasen-base/patches/patch-aj13
-rw-r--r--japanese/chasen-base/patches/patch-ak13
-rw-r--r--japanese/chasen/DESCR1
-rw-r--r--japanese/chasen/Makefile25
-rw-r--r--japanese/chasen/Makefile.common8
-rw-r--r--japanese/chasen/PLIST2
-rw-r--r--japanese/chasen/buildlink.mk49
-rw-r--r--japanese/freewnn-lib/DESCR7
-rw-r--r--japanese/freewnn-lib/Makefile13
-rw-r--r--japanese/freewnn-lib/Makefile.common83
-rw-r--r--japanese/freewnn-lib/PLIST240
-rw-r--r--japanese/freewnn-lib/distinfo11
-rw-r--r--japanese/freewnn-lib/files/INSTALL24
-rw-r--r--japanese/freewnn-lib/files/ja_freewnn34
-rw-r--r--japanese/freewnn-lib/patches/patch-aa51
-rw-r--r--japanese/freewnn-lib/patches/patch-ab22
-rw-r--r--japanese/freewnn-lib/patches/patch-ac22
-rw-r--r--japanese/freewnn-lib/patches/patch-ad23
-rw-r--r--japanese/freewnn-lib/patches/patch-ae23
-rw-r--r--japanese/freewnn-lib/patches/patch-af15
-rw-r--r--japanese/freewnn-lib/patches/patch-ag18
-rw-r--r--japanese/freewnn-server/DESCR7
-rw-r--r--japanese/freewnn-server/Makefile17
-rw-r--r--japanese/freewnn-server/PLIST70
-rw-r--r--japanese/freewnn-server/distinfo11
-rw-r--r--japanese/gawk/DESCR5
-rw-r--r--japanese/gawk/Makefile27
-rw-r--r--japanese/gawk/PLIST27
-rw-r--r--japanese/gawk/distinfo9
-rw-r--r--japanese/gawk/patches/patch-aa38
-rw-r--r--japanese/gawk/patches/patch-ab25
-rw-r--r--japanese/gawk/patches/patch-ac31
-rw-r--r--japanese/grep/DESCR9
-rw-r--r--japanese/grep/Makefile20
-rw-r--r--japanese/grep/PLIST7
-rw-r--r--japanese/grep/distinfo7
-rw-r--r--japanese/grep/patches/patch-aa2844
-rw-r--r--japanese/grep/patches/patch-ab26
-rw-r--r--japanese/grep/patches/patch-ac25
-rw-r--r--japanese/groff/DESCR2
-rw-r--r--japanese/groff/Makefile22
-rw-r--r--japanese/groff/PLIST328
-rw-r--r--japanese/groff/distinfo18
-rw-r--r--japanese/groff/patches/patch-aa56
-rw-r--r--japanese/groff/patches/patch-ab34
-rw-r--r--japanese/groff/patches/patch-ac11
-rw-r--r--japanese/groff/patches/patch-ad12
-rw-r--r--japanese/groff/patches/patch-ae9
-rw-r--r--japanese/groff/patches/patch-af9
-rw-r--r--japanese/groff/patches/patch-ag9
-rw-r--r--japanese/groff/patches/patch-ah9
-rw-r--r--japanese/groff/patches/patch-ai9
-rw-r--r--japanese/groff/patches/patch-aj9
-rw-r--r--japanese/groff/patches/patch-ak9
-rw-r--r--japanese/groff/patches/patch-al12
-rw-r--r--japanese/ipadic/DESCR1
-rw-r--r--japanese/ipadic/Makefile25
-rw-r--r--japanese/ipadic/PLIST18
-rw-r--r--japanese/ipadic/distinfo8
-rw-r--r--japanese/ipadic/patches/patch-aa13
-rw-r--r--japanese/ipadic/patches/patch-ab13
-rw-r--r--japanese/ipadic/patches/patch-ad16
-rw-r--r--japanese/ipadic/patches/patch-ae16
-rw-r--r--japanese/jhd/DESCR6
-rw-r--r--japanese/jhd/Makefile20
-rw-r--r--japanese/jhd/PLIST3
-rw-r--r--japanese/jhd/distinfo4
-rw-r--r--japanese/kakasi/DESCR7
-rw-r--r--japanese/kakasi/Makefile23
-rw-r--r--japanese/kakasi/PLIST18
-rw-r--r--japanese/kakasi/buildlink.mk49
-rw-r--r--japanese/kakasi/distinfo6
-rw-r--r--japanese/kakasi/patches/patch-aa26
-rw-r--r--japanese/kakasi/patches/patch-ab13
-rw-r--r--japanese/kbanner/DESCR3
-rw-r--r--japanese/kbanner/Makefile15
-rw-r--r--japanese/kbanner/PLIST3
-rw-r--r--japanese/kbanner/distinfo10
-rw-r--r--japanese/kbanner/patches/patch-aa33
-rw-r--r--japanese/kbanner/patches/patch-ab53
-rw-r--r--japanese/kbanner/patches/patch-ac235
-rw-r--r--japanese/kbanner/patches/patch-ad235
-rw-r--r--japanese/kbanner/patches/patch-ae226
-rw-r--r--japanese/kbanner/patches/patch-af21
-rw-r--r--japanese/kinput2/DESCR12
-rw-r--r--japanese/kinput2/MESSAGE9
-rw-r--r--japanese/kinput2/Makefile58
-rw-r--r--japanese/kinput2/PLIST-common4
-rw-r--r--japanese/kinput2/PLIST-freewnn15
-rw-r--r--japanese/kinput2/PLIST-sj37
-rw-r--r--japanese/kinput2/distinfo5
-rw-r--r--japanese/kinput2/files/Kinput2.conf22
-rw-r--r--japanese/kinput2/patches/patch-aa10
-rw-r--r--japanese/less/DESCR11
-rw-r--r--japanese/less/Makefile20
-rw-r--r--japanese/less/PLIST6
-rw-r--r--japanese/less/distinfo9
-rw-r--r--japanese/less/patches/patch-aa18
-rw-r--r--japanese/less/patches/patch-ab32
-rw-r--r--japanese/less/patches/patch-ac87
-rw-r--r--japanese/man/DESCR7
-rw-r--r--japanese/man/MESSAGE6
-rw-r--r--japanese/man/Makefile73
-rw-r--r--japanese/man/PLIST1613
-rw-r--r--japanese/man/PLIST.x68k9
-rw-r--r--japanese/man/distinfo10
-rw-r--r--japanese/man/patches/patch-aa11
-rw-r--r--japanese/man/patches/patch-ab73
-rw-r--r--japanese/man/patches/patch-ac22
-rw-r--r--japanese/man/patches/patch-ad10
-rw-r--r--japanese/man/patches/patch-ae10
-rw-r--r--japanese/man/patches/patch-af19
-rw-r--r--japanese/mh/DESCR3
-rw-r--r--japanese/mh/Makefile31
-rw-r--r--japanese/mh/PLIST176
-rw-r--r--japanese/mh/distinfo22
-rw-r--r--japanese/mh/patches/patch-aa12
-rw-r--r--japanese/mh/patches/patch-ab12
-rw-r--r--japanese/mh/patches/patch-ac12
-rw-r--r--japanese/mh/patches/patch-ad12
-rw-r--r--japanese/mh/patches/patch-ae12
-rw-r--r--japanese/mh/patches/patch-af12
-rw-r--r--japanese/mh/patches/patch-ag12
-rw-r--r--japanese/mh/patches/patch-ah12
-rw-r--r--japanese/mh/patches/patch-ai12
-rw-r--r--japanese/mh/patches/patch-aj12
-rw-r--r--japanese/mh/patches/patch-ak12
-rw-r--r--japanese/mh/patches/patch-al39
-rw-r--r--japanese/mh/patches/patch-am12
-rw-r--r--japanese/mh/patches/patch-an12
-rw-r--r--japanese/mh/patches/patch-ao12
-rw-r--r--japanese/mh/patches/patch-ap13
-rw-r--r--japanese/mh/patches/patch-aq13
-rw-r--r--japanese/mh/patches/patch-ar14
-rw-r--r--japanese/mknmz-wwwoffle/DESCR2
-rw-r--r--japanese/mknmz-wwwoffle/Makefile19
-rw-r--r--japanese/mknmz-wwwoffle/PLIST4
-rw-r--r--japanese/mknmz-wwwoffle/distinfo4
-rw-r--r--japanese/namazu1/DEINSTALL18
-rw-r--r--japanese/namazu1/DESCR9
-rw-r--r--japanese/namazu1/INSTALL27
-rw-r--r--japanese/namazu1/Makefile60
-rw-r--r--japanese/namazu1/PLIST44
-rw-r--r--japanese/namazu1/distinfo5
-rw-r--r--japanese/namazu1/patches/patch-aa52
-rw-r--r--japanese/namazu2/DEINSTALL18
-rw-r--r--japanese/namazu2/DESCR5
-rw-r--r--japanese/namazu2/INSTALL64
-rw-r--r--japanese/namazu2/Makefile59
-rw-r--r--japanese/namazu2/PLIST139
-rw-r--r--japanese/namazu2/distinfo14
-rw-r--r--japanese/namazu2/patches/patch-aa21
-rw-r--r--japanese/namazu2/patches/patch-ab30
-rw-r--r--japanese/namazu2/patches/patch-af34
-rw-r--r--japanese/namazu2/patches/patch-ag183
-rw-r--r--japanese/namazu2/patches/patch-ah29
-rw-r--r--japanese/namazu2/patches/patch-ai15
-rw-r--r--japanese/namazu2/patches/patch-al13
-rw-r--r--japanese/namazu2/patches/patch-am40
-rw-r--r--japanese/namazu2/patches/patch-an69
-rw-r--r--japanese/namazu2/patches/patch-ao40
-rw-r--r--japanese/nkf/DESCR8
-rw-r--r--japanese/nkf/Makefile24
-rw-r--r--japanese/nkf/PLIST3
-rw-r--r--japanese/nkf/distinfo6
-rw-r--r--japanese/nkf/files/nkf.post-extract19
-rw-r--r--japanese/p5-Jcode/DESCR8
-rw-r--r--japanese/p5-Jcode/Makefile29
-rw-r--r--japanese/p5-Jcode/PLIST1
-rw-r--r--japanese/p5-Jcode/distinfo5
-rw-r--r--japanese/p5-Jcode/patches/patch-aa17
-rw-r--r--japanese/p5-Text-ChaSen/DESCR5
-rw-r--r--japanese/p5-Text-ChaSen/Makefile25
-rw-r--r--japanese/p5-Text-ChaSen/PLIST1
-rw-r--r--japanese/p5-Text-ChaSen/distinfo6
-rw-r--r--japanese/p5-Text-Kakasi/DESCR5
-rw-r--r--japanese/p5-Text-Kakasi/Makefile21
-rw-r--r--japanese/p5-Text-Kakasi/PLIST1
-rw-r--r--japanese/p5-Text-Kakasi/distinfo5
-rw-r--r--japanese/p5-Text-Kakasi/patches/patch-aa14
-rw-r--r--japanese/p5-jcode/DESCR8
-rw-r--r--japanese/p5-jcode/Makefile27
-rw-r--r--japanese/p5-jcode/PLIST2
-rw-r--r--japanese/p5-jcode/distinfo4
-rw-r--r--japanese/p5-nkf/DESCR7
-rw-r--r--japanese/p5-nkf/Makefile22
-rw-r--r--japanese/p5-nkf/PLIST1
-rw-r--r--japanese/p5-nkf/distinfo4
-rw-r--r--japanese/qkc/DESCR4
-rw-r--r--japanese/qkc/Makefile21
-rw-r--r--japanese/qkc/PLIST3
-rw-r--r--japanese/qkc/distinfo4
-rw-r--r--japanese/ruby-romkan/DESCR2
-rw-r--r--japanese/ruby-romkan/Makefile29
-rw-r--r--japanese/ruby-romkan/PLIST7
-rw-r--r--japanese/ruby-romkan/distinfo4
-rw-r--r--japanese/ruby-uconv/DESCR7
-rw-r--r--japanese/ruby-uconv/Makefile35
-rw-r--r--japanese/ruby-uconv/PLIST12
-rw-r--r--japanese/ruby-uconv/distinfo4
-rw-r--r--japanese/sed/DESCR6
-rw-r--r--japanese/sed/Makefile30
-rw-r--r--japanese/sed/PLIST9
-rw-r--r--japanese/sed/distinfo7
-rw-r--r--japanese/sed/patches/patch-aa16
-rw-r--r--japanese/sj3-lib/DESCR20
-rw-r--r--japanese/sj3-lib/Makefile21
-rw-r--r--japanese/sj3-lib/PLIST3
-rw-r--r--japanese/sj3-lib/distinfo11
-rw-r--r--japanese/sj3-lib/patches/patch-aa452
-rw-r--r--japanese/sj3-lib/patches/patch-ab20
-rw-r--r--japanese/sj3-lib/patches/patch-ac13
-rw-r--r--japanese/sj3-lib/patches/patch-ad39
-rw-r--r--japanese/sj3-lib/patches/patch-ae28
-rw-r--r--japanese/sj3-lib/patches/patch-af16
-rw-r--r--japanese/sj3-lib/patches/patch-ag95
-rw-r--r--japanese/sj3-server/DESCR20
-rw-r--r--japanese/sj3-server/INSTALL9
-rw-r--r--japanese/sj3-server/Makefile62
-rw-r--r--japanese/sj3-server/PLIST33
-rw-r--r--japanese/sj3-server/distinfo11
-rw-r--r--japanese/skkfep/DESCR7
-rw-r--r--japanese/skkfep/INSTALL39
-rw-r--r--japanese/skkfep/MESSAGE9
-rw-r--r--japanese/skkfep/Makefile30
-rw-r--r--japanese/skkfep/PLIST4
-rw-r--r--japanese/skkfep/distinfo14
-rw-r--r--japanese/skkfep/patches/patch-aa46
-rw-r--r--japanese/skkfep/patches/patch-ab22
-rw-r--r--japanese/skkfep/patches/patch-ac14
-rw-r--r--japanese/skkfep/patches/patch-ba11
-rw-r--r--japanese/skkfep/patches/patch-bb146
-rw-r--r--japanese/skkfep/patches/patch-bc38
-rw-r--r--japanese/skkfep/patches/patch-bd21
-rw-r--r--japanese/skkfep/patches/patch-be66
-rw-r--r--japanese/skkfep/patches/patch-bf104
-rw-r--r--japanese/skkfep/patches/patch-bg70
-rw-r--r--japanese/skkinput/DESCR4
-rw-r--r--japanese/skkinput/INSTALL39
-rw-r--r--japanese/skkinput/MESSAGE9
-rw-r--r--japanese/skkinput/Makefile34
-rw-r--r--japanese/skkinput/PLIST9
-rw-r--r--japanese/skkinput/distinfo9
-rw-r--r--japanese/skkinput/patches/patch-aa21
-rw-r--r--japanese/skkinput/patches/patch-ab103
-rw-r--r--japanese/skkinput/patches/patch-ac75
-rw-r--r--japanese/skkinput/patches/patch-ad184
-rw-r--r--japanese/skkinput/patches/patch-ae39
-rw-r--r--japanese/skkserv/DESCR6
-rw-r--r--japanese/skkserv/INSTALL13
-rw-r--r--japanese/skkserv/MESSAGE6
-rw-r--r--japanese/skkserv/Makefile63
-rw-r--r--japanese/skkserv/PLIST11
-rw-r--r--japanese/skkserv/distinfo16
-rw-r--r--japanese/skkserv/files/skkserv.sh26
-rw-r--r--japanese/skkserv/patches/patch-aa21
-rw-r--r--japanese/skkserv/patches/patch-ab13
-rw-r--r--japanese/skkserv/patches/patch-ac15
-rw-r--r--japanese/skkserv/patches/patch-ad13
-rw-r--r--japanese/skkserv/patches/patch-ae14
-rw-r--r--japanese/skkserv/patches/patch-af282
-rw-r--r--japanese/skkserv/patches/patch-ag142
-rw-r--r--japanese/skkserv/patches/patch-ah13
-rw-r--r--japanese/skkserv/patches/patch-bsearch123
-rw-r--r--japanese/skkserv/patches/patch-jisyo112
-rw-r--r--japanese/texfamily-share/DESCR19
-rw-r--r--japanese/texfamily-share/Makefile69
-rw-r--r--japanese/texfamily-share/PLIST2
-rw-r--r--japanese/texfamily-share/distinfo22
-rw-r--r--japanese/texfamily/DESCR19
-rw-r--r--japanese/texfamily/Makefile163
-rw-r--r--japanese/texfamily/PLIST183
-rw-r--r--japanese/texfamily/distinfo34
-rw-r--r--japanese/texfamily/patches/patch-aa116
-rw-r--r--japanese/texfamily/patches/patch-ab17
-rw-r--r--japanese/texfamily/patches/patch-ac11
-rw-r--r--japanese/texfamily/patches/patch-ad39
-rw-r--r--japanese/texfamily/patches/patch-ae63
-rw-r--r--japanese/texfamily/patches/patch-af13
-rw-r--r--japanese/texfamily/patches/patch-ag13
-rw-r--r--japanese/texfamily/patches/patch-ah44
-rw-r--r--japanese/texfamily/patches/patch-ai23
-rw-r--r--japanese/texfamily/patches/patch-aj13
-rw-r--r--japanese/vflib-lib/DESCR29
-rw-r--r--japanese/vflib-lib/Makefile32
-rw-r--r--japanese/vflib-lib/Makefile.common36
-rw-r--r--japanese/vflib-lib/PLIST417
-rw-r--r--japanese/vflib-lib/buildlink.mk36
-rw-r--r--japanese/vflib-lib/distinfo10
-rw-r--r--japanese/vflib-lib/patches/patch-aa47
-rw-r--r--japanese/vflib-lib/patches/patch-ab32
-rw-r--r--japanese/vflib-lib/patches/patch-ac33
-rw-r--r--japanese/vflib-lib/patches/patch-ad90
-rw-r--r--japanese/vflib-lib/patches/patch-ae13
-rw-r--r--japanese/vflib-lib/patches/patch-af43
-rw-r--r--japanese/vflib-utils/DESCR7
-rw-r--r--japanese/vflib-utils/Makefile18
-rw-r--r--japanese/vflib-utils/PLIST7
-rw-r--r--japanese/vflib/DESCR5
-rw-r--r--japanese/vflib/Makefile26
-rw-r--r--japanese/vflib/PLIST2
-rw-r--r--japanese/vfxdvik/DESCR1
-rw-r--r--japanese/vfxdvik/Makefile68
-rw-r--r--japanese/vfxdvik/PLIST10
-rw-r--r--japanese/vfxdvik/distinfo11
-rw-r--r--japanese/vfxdvik/patches/patch-ac96
-rw-r--r--japanese/vfxdvik/patches/patch-ad13
-rw-r--r--japanese/vfxdvik/patches/patch-ae16
-rw-r--r--japanese/vfxdvik/patches/patch-af10
-rw-r--r--japanese/vfxdvik/patches/patch-ag13
-rw-r--r--japanese/xjdic/DESCR4
-rw-r--r--japanese/xjdic/MESSAGE5
-rw-r--r--japanese/xjdic/Makefile53
-rw-r--r--japanese/xjdic/PLIST23
-rw-r--r--japanese/xjdic/distinfo10
-rw-r--r--japanese/xjdic/patches/patch-aa13
-rw-r--r--japanese/xjdic/patches/patch-ab13
-rw-r--r--japanese/xjman/DESCR12
-rw-r--r--japanese/xjman/MESSAGE13
-rw-r--r--japanese/xjman/Makefile74
-rw-r--r--japanese/xjman/PLIST5
-rw-r--r--japanese/xjman/distinfo4
-rw-r--r--japanese/xjman/files/COPYRIGHT396
-rw-r--r--japanese/xjman/files/COPYRIGHT.XJDP27
-rw-r--r--japanese/xjman/files/Makefile3
-rw-r--r--japanese/xjman/files/Makefile.inc9
347 files changed, 0 insertions, 16094 deletions
diff --git a/japanese/canna-lib/patches/patch-ae b/japanese/canna-lib/patches/patch-ae
deleted file mode 100644
index 22b30f93e52..00000000000
--- a/japanese/canna-lib/patches/patch-ae
+++ /dev/null
@@ -1,234 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2000/12/01 03:15:34 itojun Exp $
-
-PATCH_SITES+= http://apps.v6.linux.or.jp/pub/Linux/IPv6-2/canna/
-PATCHFILES+= Canna35b2-v6-20000602.diff.gz
-PATCH_DIST_STRIP= -p1
-(copied here for as the above patch does not apply cleanly
-
-diff -ru lib/RKC/Imakefile lib/RKC/Imakefile
---- lib/RKC/Imakefile Tue Oct 22 21:26:34 1996
-+++ lib/RKC/Imakefile Fri Jun 2 15:11:31 2000
-@@ -11,7 +11,7 @@
- LINTLIBS = ../RK/llib-lRK.ln
- INCLUDES = -I$(CANNAROOT)/include
-
-- DEFINES = $(SIGNAL_DEFINES) $(RKC_DEFINES) $(ENGINE_DEFS)
-+ DEFINES = $(SIGNAL_DEFINES) $(RKC_DEFINES) $(ENGINE_DEFS) $(INET6_DEFS)
-
- HEADER = rkc.h rkcw.h
- OBJS = rkc.o convert.o wconvert.o wutil.o
-diff -ru lib/RKC/wconvert.c lib/RKC/wconvert.c
---- lib/RKC/wconvert.c Wed Nov 27 16:22:30 1996
-+++ lib/RKC/wconvert.c Fri Jun 2 15:01:34 2000
-@@ -368,13 +368,46 @@
- int number ;
- char *hostname ;
- {
-+#ifdef INET6
-+ struct addrinfo hints, *res0, *res;
-+ struct servent *sp ;
-+ char servbuf[NI_MAXSERV];
-+#else
- struct sockaddr_in inaddr; /* INET socket address. */
- unsigned long hostinetaddr; /* result of inet_addr of arpa addr */
- struct hostent *host_ptr, workhostbuf ;
- struct servent *sp ;
- int addrlen ;
- char *h_addr_ptr;
-+#endif
-
-+#ifdef INET6
-+ sp = getservbyname( IR_SERVICE_NAME, "tcp");
-+ sprintf(servbuf, "%u", (sp ? ntohs(sp->s_port) : IR_DEFAULT_PORT) + number);
-+ memset( &hints, 0, sizeof( hints ) );
-+ hints.ai_family = PF_UNSPEC;
-+ hints.ai_socktype = SOCK_STREAM;
-+ if ( getaddrinfo( hostname, servbuf, &hints, &res0 ) ){
-+ errno = EINVAL;
-+ return( -1 );
-+ }
-+ for( res = res0 ; res ; res = res->ai_next ){
-+ if( res->ai_family != PF_INET && res->ai_family != PF_INET6 )
-+ continue;
-+ if( (ServerFD = socket( res->ai_family, res->ai_socktype, res->ai_protocol )) < 0 )
-+ continue;
-+ errno = 0;
-+ if( connect( ServerFD, res->ai_addr, res->ai_addrlen ) ){
-+#ifdef nodef
-+ perror("connect");
-+#endif
-+ close( ServerFD ) ;
-+ ServerFD = -1;
-+ continue;
-+ }
-+ }
-+ freeaddrinfo( res0 );
-+#else /* INET6 / !INET6 */
- /* ¥¤¥ó¥¿¡¼¥Í¥Ã¥È¥É¥á¥¤¥ó¤ÇÀܳ¤¹¤ë¡£ */
- if( (host_ptr = gethostbyname( hostname ) )
- == (struct hostent *)NULL) {
-@@ -423,8 +456,10 @@
- perror("connect") ;
- #endif
- close( ServerFD ) ;
-+ ServerFD = -1;
- return( -1 ) ;
- }
-+#endif /* !INET6 */
- return( ServerFD ) ;
- }
- #endif
-diff -ru server/Imakefile server/Imakefile
---- server/Imakefile Wed Nov 27 16:25:24 1996
-+++ server/Imakefile Fri Jun 2 14:52:47 2000
-@@ -5,12 +5,12 @@
- INSTUGIDFLAGS = -m 6555 $(cannaOwnerGroup)
- #ifdef __EMX__
- INSTFLAGS = $(INSTUGIDFLAGS)
-- LOCAL_LIBRARIES = $(CANNAROOT)/lib/RK/RK.a
-+ LOCAL_LIBRARIES = $(CANNAROOT)/lib/RK/RK.a $(INET6_LIBS)
- #else
- INSTFLAGS = -s $(INSTUGIDFLAGS)
-- LOCAL_LIBRARIES = $(CANNAROOT)/lib/RK/libRK.a
-+ LOCAL_LIBRARIES = $(CANNAROOT)/lib/RK/libRK.a $(INET6_LIBS)
- #endif
-- DEFINES = $(CANNASERVER_DEFINES)
-+ DEFINES = $(CANNASERVER_DEFINES) $(INET6_DEFS)
- INCLUDES = -I$(CANNAROOT)/include
-
- IRSRCS = $(SRCS) $(HEADER)
-diff -ru server/connection.c server/connection.c
---- server/connection.c Wed Nov 27 16:26:10 1996
-+++ server/connection.c Fri Dec 1 11:52:10 2000
-@@ -133,2 +133,63 @@
- #ifdef USE_INET_SOCKET /* £É£Î£Å£Ô¥É¥á¥¤¥ó¤ÎºîÀ® */
-+#ifdef INET6
-+static int open_inet6_socket ()
-+{
-+ extern int PortNumberPlus;
-+ struct sockaddr_in6 in6sock;
-+ struct servent *sp;
-+ int retry, request;
-+
-+ /* /etc/services¤«¤é¥Ý¡¼¥ÈÈÖ¹æ¤ò¼èÆÀ¤¹¤ë */
-+ if( (sp = getservbyname(IR_SERVICE_NAME ,"tcp")) == NULL )
-+ {
-+ ir_debug( Dmsg(5,"Warning: Port number not find on '/etc/services'.\n");)
-+ ir_debug( Dmsg(5," Use %d as default.\n", IR_DEFAULT_PORT);)
-+ }
-+
-+ if ((request = socket (AF_INET6, SOCK_STREAM, 0)) < 0)
-+ {
-+ ir_debug( Dmsg(5,"Warning: INET socket for server failed.\n");)
-+ }
-+ else
-+ {
-+#ifdef SO_REUSEADDR
-+ {
-+ int one = 1;
-+ setsockopt(request, SOL_SOCKET, SO_REUSEADDR,
-+ (char *)&one, sizeof(int));
-+ }
-+#endif
-+ bzero ((char *)&in6sock, sizeof (in6sock));
-+ in6sock.sin6_family = AF_INET6;
-+ in6sock.sin6_port =
-+ (sp ? ntohs(sp->s_port) : IR_DEFAULT_PORT) + PortNumberPlus;
-+
-+ ir_debug( Dmsg(5, "¥Ý¡¼¥ÈÈÖ¹æ:[%d]\n",htons(in6sock.sin6_port));)
-+
-+ in6sock.sin6_port = htons(in6sock.sin6_port);
-+ in6sock.sin6_addr = in6addr_any;
-+
-+ retry = 0;
-+ while ( bind(request, (struct sockaddr *)&in6sock, sizeof(in6sock)) < 0 )
-+ {
-+ ir_debug( Dmsg(5, "bind ¥È¥é¥¤²ó¿ô[%d]\n",retry);)
-+ if (++retry == 5){
-+ ir_debug( Dmsg(5,"Warning: Server could not bind.\n");)
-+ close(request);
-+ request = -1; /* bind ¼ºÇÔ */
-+ break;
-+ }
-+ sleep (1);
-+ }
-+ if( retry != 5 ) {
-+ if (listen (request, 5)){
-+ ir_debug( Dmsg(5,"Warning: Server could not listen.\n");)
-+ close(request);
-+ request = -1; /* listen ¼ºÇÔ */
-+ }
-+ }
-+ }
-+ return request;
-+}
-+#endif
- static int open_inet_socket ()
-@@ -200,2 +261,5 @@
- int request;
-+#if defined(USE_INET_SOCKET) && defined(INET6)
-+ int inet6_ok = 0;
-+#endif
-
-@@ -222,2 +286,14 @@
- #ifdef USE_INET_SOCKET /* £É£Î£Å£Ô¥É¥á¥¤¥ó */
-+#ifdef INET6
-+ if ((request = open_inet6_socket ()) != -1)
-+ {
-+ inet6_ok++;
-+ WellKnownConnections |= (1L << request);
-+ ir_debug( Dmsg(3,"INET6 domain socket is created\n"); )
-+ }
-+ else
-+ {
-+ ir_debug( Dmsg(5,"Warning: INET6 domain not created.\n");)
-+ }
-+#endif
- if ((request = open_inet_socket ()) != -1)
-@@ -229,3 +305,9 @@
- ir_debug( Dmsg(5,"Warning: INET domain not created.\n");)
-+#ifdef INET6
-+ if ( !inet6_ok ){
-+ return 0; /* ºîÀ®¤Ë¼ºÇÔ */
-+ }
-+#else
- return 0; /* ºîÀ®¤Ë¼ºÇÔ */
-+#endif
- }
-@@ -609,6 +691,11 @@
- {
-+#ifdef INET6
-+ struct sockaddr_storage from;
-+#else
- struct sockaddr_in from;
- struct hostent *hp;
-- char buf[MAXDATA], *inet_ntoa();
-- int fromlen = sizeof( struct sockaddr_in ) ;
-+ char *inet_ntoa();
-+#endif
-+ char buf[MAXDATA];
-+ int fromlen = sizeof(from);
-
-@@ -622,2 +709,15 @@
-
-+#ifdef INET6
-+#ifdef AF_UNIX
-+ if (from.ss_family != AF_UNIX)
-+#else
-+ if (from.ss_family != AF_LOCAL)
-+#endif
-+ {
-+ if (getnameinfo((struct sockaddr *)&from, fromlen, buf, sizeof(buf),
-+ NULL, 0, 0) != 0) {
-+ strcpy(buf, "invalid");
-+ }
-+ }
-+#else
- if( from.sin_family == AF_INET ) {
-@@ -630,3 +730,5 @@
- strncpy( buf, inet_ntoa( from.sin_addr ), MAXDATA-1 ) ;
-- } else {
-+ }
-+#endif
-+ else {
- client->hostaddr = IR_UNIX_ADDRESS;
diff --git a/japanese/canna-lib/patches/patch-af b/japanese/canna-lib/patches/patch-af
deleted file mode 100644
index 76aee7aa0c9..00000000000
--- a/japanese/canna-lib/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2002/04/04 16:03:18 uebayasi Exp $
-
---- lib/RKC/convert.c.orig Wed May 22 22:02:57 1996
-+++ lib/RKC/convert.c
-@@ -32,7 +32,7 @@
- #ifndef WIN
- #include "sglobal.h"
- #endif
--#include "IRproto.h"
-+#include "../server/IRproto.h"
-
- #include <errno.h>
- #include <sys/types.h>
diff --git a/japanese/canna-server/DESCR b/japanese/canna-server/DESCR
deleted file mode 100644
index 14268d78991..00000000000
--- a/japanese/canna-server/DESCR
+++ /dev/null
@@ -1,13 +0,0 @@
-Canna is a Kana-Kanji conversion server.
-Support Mule(Multi-lingal extention Emacs), kinput2 X11 input method,
-cannum front end and some others.
-
- To use from Mule (CANNA version), in .emacs file:
-
- (if (and (boundp 'CANNA) CANNA) ; Is it CANNA MULE?
- (progn
- (load-library "canna")
- (canna) ))
-
- Then kana-kanji conversion begin to `C-o' key. Show more detail
-Info, and/or documents.
diff --git a/japanese/canna-server/INSTALL b/japanese/canna-server/INSTALL
deleted file mode 100755
index 1219a0a90cf..00000000000
--- a/japanese/canna-server/INSTALL
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-if [ "$2" != "POST-INSTALL" ]; then exit 0; fi
-(grep -v ^# /etc/services | grep 'canna.*5680' >/dev/null) || \
- (echo "" >> /etc/services; \
- echo "# canna package" >> /etc/services; \
- echo "canna 5680/tcp" >> /etc/services; \
- )
diff --git a/japanese/canna-server/Makefile b/japanese/canna-server/Makefile
deleted file mode 100644
index d47fbd0a119..00000000000
--- a/japanese/canna-server/Makefile
+++ /dev/null
@@ -1,75 +0,0 @@
-# $NetBSD: Makefile,v 1.17 2002/04/14 14:04:43 jlam Exp $
-
-DISTNAME= Canna35b2
-PKGNAME= Canna-server-3.5.2
-CATEGORIES= japanese
-MASTER_SITES= ftp://ftp.nec.co.jp/pub/Canna/Canna35/
-
-PATCH_SITES= http://www.jaist.ac.jp/~fujieda/canna/
-PATCHFILES= Canna35b2-unoff1.patch.gz Canna35b2-unoff2.patch.gz \
- Canna35b2-hack1.patch.gz
-PATCH_DIST_STRIP= -p1
-
-MAINTAINER= tech-pkg-ja@jp.netbsd.org
-HOMEPAGE= http://www.nec.co.jp/japanese/product/computer/soft/canna/
-COMMENT= Kana-Kanji conversion system (server)
-
-DEPENDS+= Canna-lib>=3.5.2:../../japanese/canna-lib
-
-FILESDIR= ${.CURDIR}/../../japanese/canna-lib/files
-DISTINFO_FILE= ${.CURDIR}/../../japanese/canna-lib/distinfo
-PATCHDIR= ${.CURDIR}/../../japanese/canna-lib/patches
-
-BUILD_DEFS+= USE_INET6
-USE_X11BASE= yes
-
-.include "../../mk/bsd.prefs.mk"
-.if 0 # ${USE_INET6} == "YES"
-INET6= -DINET6
-.else
-INET6= # empty
-.endif
-CANNAOWNER?= daemon
-CANNAGROUP?= daemon
-CANNA_SPOOL= /var/spool/canna
-CANNA_MODE= 0755
-DICT_DIR?= /var/dict
-MAKE_ENV+= CANNAOWNER=${CANNAOWNER} CANNAGROUP=${CANNAGROUP} \
- CANNA_SPOOL=${CANNA_SPOOL} DICT_DIR=${DICT_DIR} INET6=${INET6}
-PLIST_SUBST= CANNAOWNER=${CANNAOWNER} CANNAGROUP=${CANNAGROUP} \
- CANNA_SPOOL=${CANNA_SPOOL} CANNA_MODE=${CANNA_MODE} \
- DICT_DIR=${DICT_DIR} PREFIX=${PREFIX}
-
-INSTALL_TARGET= instserver instclient
-
-post-patch:
- ${MV} ${WRKSRC}/Imakefile ${WRKSRC}/Imakefile.orig
- ${SED} -e 's|\(SUBDIRS = .*\) misc\(.*\)|\1\2|' \
- -e 's|\(SERVERDIR = .*\) dic/phono\(.*\)|\1\2|' \
- -e 's|\(CLIENTDIR = .*\) dic/phono misc|\1|' \
- ${WRKSRC}/Imakefile.orig > ${WRKSRC}/Imakefile
- ${FIND} ${WRKSRC} -name Imakefile -print | \
- while read f; do \
- ${CP} $$f $${f}.orig; \
- ( \
- ${ECHO} '/#include ".*\/Canna.conf"$$/a\'; \
- ${ECHO} '#include "${FILESDIR}/LinkFileList.rules"'; \
- ) | ${SED} -f /dev/stdin $${f}.orig >$$f; \
- done
-
-
-do-configure:
- @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${XMKMF})
-
-post-build:
- @${SED} -e 's|@PREFIX@|${PREFIX}|g' ${FILESDIR}/canna \
- > ${WRKDIR}/canna
-
-post-install:
- @${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
- @${INSTALL_SCRIPT} ${WRKDIR}/canna ${PREFIX}/etc/rc.d/canna
- @${INSTALL_DATA_DIR} ${CANNA_SPOOL}
- @${CHMOD} ${CANNA_MODE} ${CANNA_SPOOL}
- @${CHOWN} ${CANNAOWNER}:${CANNAGROUP} ${CANNA_SPOOL}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/japanese/canna-server/PLIST b/japanese/canna-server/PLIST
deleted file mode 100644
index b3554717bd5..00000000000
--- a/japanese/canna-server/PLIST
+++ /dev/null
@@ -1,70 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2002/02/18 01:02:51 hubertf Exp $
-@cwd ${DICT_DIR}
-@cwd ${DICT_DIR}
-canna/canna/bushu.cld
-canna/canna/chimei.ctd
-canna/canna/dics.dir
-canna/canna/fuzokugo.cbd
-canna/canna/fuzokugo.cld
-canna/canna/hojomwd.ctd
-canna/canna/hojoswd.ctd
-canna/canna/iroha.cbd
-canna/canna/iroha.cld
-canna/canna/kanasmpl.ctd
-canna/canna/katakana.ctd
-canna/canna/keishiki.ctd
-canna/canna/necgaiji.ctd
-canna/canna/number.ctd
-canna/canna/software.ctd
-canna/canna/suffix.ctd
-@cwd ${PREFIX}
-bin/canlisp
-bin/cannacheck
-bin/cannakill
-bin/cannastat
-bin/catdic
-bin/crfreq
-bin/crxdic
-bin/crxgram
-bin/cshost
-bin/ctow
-bin/dicar
-bin/dpbindic
-bin/dpromdic
-bin/dpxdic
-bin/forcpp
-bin/forsort
-bin/kpdic
-bin/mergeword
-bin/mkbindic
-bin/mkromdic
-bin/splitword
-bin/wtoc
-etc/rc.d/canna
-man/ja_JP.EUC/man1/addwords.1
-man/ja_JP.EUC/man1/cannacheck.1
-man/ja_JP.EUC/man1/cannakill.1
-man/ja_JP.EUC/man1/cannaserver.1
-man/ja_JP.EUC/man1/cannastat.1
-man/ja_JP.EUC/man1/catdic.1
-man/ja_JP.EUC/man1/cpdic.1
-man/ja_JP.EUC/man1/cshost.1
-man/ja_JP.EUC/man1/ctow.1
-man/ja_JP.EUC/man1/delwords.1
-man/ja_JP.EUC/man1/dicar.1
-man/ja_JP.EUC/man1/dpbindic.1
-man/ja_JP.EUC/man1/dpromdic.1
-man/ja_JP.EUC/man1/lsdic.1
-man/ja_JP.EUC/man1/mkbindic.1
-man/ja_JP.EUC/man1/mkdic.1
-man/ja_JP.EUC/man1/mkromdic.1
-man/ja_JP.EUC/man1/mvdic.1
-man/ja_JP.EUC/man1/rmdic.1
-man/ja_JP.EUC/man1/splitword.1
-man/ja_JP.EUC/man1/wtoc.1
-sbin/cannaserver
-@exec ${MKDIR} ${CANNA_SPOOL}
-@exec ${CHOWN} ${CANNAOWNER}:${CANNAGROUP} ${CANNA_SPOOL}
-@exec ${CHMOD} ${CANNA_MODE} ${CANNA_SPOOL}
-@unexec ${RMDIR} ${DICT_DIR}/canna/canna
-@unexec ${RMDIR} ${CANNA_SPOOL}
diff --git a/japanese/canuum/DESCR b/japanese/canuum/DESCR
deleted file mode 100644
index 83d03c9a51b..00000000000
--- a/japanese/canuum/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-Canuum is a Japanese input frontend program from Wnn tty frontend uum.
diff --git a/japanese/canuum/Makefile b/japanese/canuum/Makefile
deleted file mode 100644
index 865c5e05f1a..00000000000
--- a/japanese/canuum/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# $NetBSD: Makefile,v 1.7 2002/04/14 14:08:56 jlam Exp $
-#
-
-DISTNAME= canuum-1.0
-CATEGORIES= japanese
-MASTER_SITES= ftp://ftp.nec.co.jp/pub/Canna/Canna35/
-DISTFILES= Uum4.109.tar.gz Canna35b2.tar.gz
-EXTRACT_ONLY= Uum4.109.tar.gz
-
-MAINTAINER= oishi@ims.ac.jp
-HOMEPAGE= http://www.nec.co.jp/japanese/product/computer/soft/canna/
-COMMENT= Japanese input tty frontend for Canna using uum
-
-DEPENDS= Canna-lib>=3.5.2:../../japanese/canna-lib
-
-MANLANG= ja
-MAN1= canuum.1
-MAKE_ARGS= PREFIX=${PREFIX}
-WRKSRC= ${WRKDIR}/Canna35b2/canuum
-USE_X11BASE= yes
-
-post-extract:
- @${GTAR} -xzf ${DISTDIR}/Canna35b2.tar.gz -C ${WRKDIR} \
- Canna35b2/Canna.conf Canna35b2/canuum
- @${MV} ${WRKDIR}/Canna35b2/Canna.conf ${WRKSRC}/
- @${CP} ${WRKDIR}/Uum4.109/* ${WRKSRC}
-
-pre-patch:
- @(cd ${WRKSRC}; ${PATCH} ${PATCH_DIST_ARGS} < Canuum.patch)
-
-do-configure:
- @(cd ${WRKSRC}; ${X11BASE}/bin/xmkmf; ${MAKE} ${MAKE_ARGS} Makefile; \
- ${MAKE} ${MAKE_ARGS} cannaconf.h; ${MAKE} ${MAKE_ARGS} depend)
-
-do-build:
- @(cd ${WRKSRC}; ${MAKE} ${MAKE_ARGS} all)
-
-post-install:
- @${INSTALL_MAN} ${WRKSRC}/canuum.jmn ${PREFIX}/man/ja_JP.EUC/man1/canuum.1
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/japanese/canuum/PLIST b/japanese/canuum/PLIST
deleted file mode 100644
index 78213ab3a7a..00000000000
--- a/japanese/canuum/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:29:04 zuntum Exp $
-bin/canuum
-man/ja_JP.EUC/man1/canuum.1
diff --git a/japanese/canuum/distinfo b/japanese/canuum/distinfo
deleted file mode 100644
index d60e1e80b0e..00000000000
--- a/japanese/canuum/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 10:13:32 wiz Exp $
-
-SHA1 (Uum4.109.tar.gz) = 9d57fa67fc321c0b1101970b02154b5d6e42e88e
-Size (Uum4.109.tar.gz) = 43738 bytes
-SHA1 (Canna35b2.tar.gz) = 66742205272cbc6bd91f272596381f761feac0a2
-Size (Canna35b2.tar.gz) = 1333329 bytes
-SHA1 (patch-aa) = 84e341fabc592fc5579d0c8b258b6e13809e8473
-SHA1 (patch-ac) = 8bcd6abc9d36305c86cf4f5993c4895a1e7c86e1
-SHA1 (patch-ae) = 1ef38a6651f2f619c15d68032787be694a2fa970
-SHA1 (patch-af) = 5860402e3dc72e0d6ddaffc6cf33c017c7e19a34
diff --git a/japanese/canuum/patches/patch-aa b/japanese/canuum/patches/patch-aa
deleted file mode 100644
index 742cd8b7d3e..00000000000
--- a/japanese/canuum/patches/patch-aa
+++ /dev/null
@@ -1,91 +0,0 @@
-$NetBSD: patch-aa,v 1.2 1999/12/08 09:16:26 rh Exp $
-
---- Canna.conf.orig Thu Nov 28 11:27:01 1996
-+++ Canna.conf Wed Dec 8 10:14:38 1999
-@@ -129,19 +129,19 @@
- */
-
--cannaBinDir = /usr/local/canna/bin
--cannaSrvDir = /usr/local/canna/bin
--cannaLibDir = /usr/local/canna/lib
--cannaManDir = /usr/local/canna/man
--cannaIncDir = /usr/local/canna/include/canna
--libCannaDir = /usr/lib
-+cannaBinDir = ${PREFIX}/bin
-+cannaSrvDir = ${PREFIX}/sbin
-+cannaLibDir = ${PREFIX}/share/canna
-+cannaManDir = ${PREFIX}/man/ja_JP.EUC
-+cannaIncDir = ${PREFIX}/include/canna
-+libCannaDir = ${PREFIX}/lib
-
--ErrDir = /usr/spool/canna
-+ErrDir = ${CANNA_SPOOL}
-
- wcharDefinition = -DCANNA_WCHAR
- Wlib =
--JapaneseLocale = japanese
-+JapaneseLocale = ja_JP.eucJP
-
--cannaOwner = bin
--cannaGroup = bin
-+cannaOwner = ${CANNAOWNER}
-+cannaGroup = ${CANNAGROUP}
-
- cannaOwnerGroup = -o $(cannaOwner) -g $(cannaGroup)
-@@ -149,5 +149,5 @@
- pointerIntegerDef =
-
--cannaDsoRev = 1
-+cannaDsoRev = 1.0
- /* SunOS 4.x ¤ò¤ª»È¤¤¤ÎÊý¤Ç shared object ¤òÍøÍѤ¹¤ë¾ì¹ç¤Ë¤Ï
- cannaDsoRev = 1.1
-@@ -202,8 +202,7 @@
- * ¥³¥Þ¥ó¥ÉÎà¤ò¥ê¥ó¥¯¤¹¤ë»þ¤Ï¡¢¼¡¤ò YES ¤Ë¤·¤Æ¤¯¤À¤¤¡£
- */
--/* #define UseInstalledLibCanna YES */
--#define UseInstalledLibCanna NO
-+#define UseInstalledLibCanna YES
-
--DicDir = $(cannaLibDir)/dic
-+DicDir = ${DICT_DIR}/canna
-
- #ifdef NeXT
-@@ -240,16 +239,16 @@
- #endif
- # endif
-- CANNALIB = -L$(libCannaDir) -lcanna $(DLLIB)
-+ CANNALIB = -Wl,-rpath,$(libCannaDir) -L$(libCannaDir) -lcanna $(DLLIB)
- #else /* ! UseInstalledLibCanna */
- # if DoSharedLib
-- DEPCANNALIB = $(CANNASRC)/libcanna.$(sharedLibExtension)
-+ DEPCANNALIB = $(libCannaDir)/libcanna.$(sharedLibExtension)
- # else
- #ifdef __EMX__
-- DEPCANNALIB = $(CANNASRC)/canna.a
-+ DEPCANNALIB = $(libCannaDir)/canna.a
- #else
-- DEPCANNALIB = $(CANNASRC)/libcanna.a
-+ DEPCANNALIB = $(libCannaDir)/libcanna.a
- #endif
- # endif
-- CANNALIB = -L$(CANNASRC) -lcanna $(DLLIB)
-+ CANNALIB = -Wl,-rpath,$(libCannaDir) -L$(libCannaDir) -lcanna $(DLLIB)
- #endif /* UseInstalledLibCanna */
-
-@@ -260,12 +259,12 @@
- DEPCANNALIB16 = $(libCannaDir)/libcanna16.a
- # endif
-- CANNALIB16 = -L$(libCannaDir) -lcanna16 $(DLLIB)
-+ CANNALIB16 = -Wl,-rpath,$(libCannaDir) -L$(libCannaDir) -lcanna16 $(DLLIB)
- #else /* ! UseInstalledLibCanna */
- # if DoSharedLib
-- DEPCANNALIB16 = $(CANNASRC)/libcanna16.$(sharedLibExtension)
-+ DEPCANNALIB16 = $(libCannaDir)/libcanna16.$(sharedLibExtension)
- # else
-- DEPCANNALIB16 = $(CANNASRC)/libcanna16.a
-+ DEPCANNALIB16 = $(libCannaDir)/libcanna16.a
- # endif
-- CANNALIB16 = -L$(CANNASRC) -lcanna16 $(DLLIB)
-+ CANNALIB16 = -Wl,-rpath,$(libCannaDir) -L$(libCannaDir) -lcanna16 $(DLLIB)
- #endif /* UseInstalledLibCanna */
-
diff --git a/japanese/canuum/patches/patch-ac b/japanese/canuum/patches/patch-ac
deleted file mode 100644
index 37ace83a1fa..00000000000
--- a/japanese/canuum/patches/patch-ac
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 1999/08/27 04:09:28 sakamoto Exp $
-
---- Imakefile.orig Tue Apr 19 20:38:45 1994
-+++ Imakefile Fri Jan 22 00:50:46 1999
-@@ -2,4 +1,4 @@
--#include "../Canna.conf"
-+#include "./Canna.conf"
-
- #if SystemV || SystemV4
- SYS_LIBRARIES = -lcurses
-@@ -7,11 +7,12 @@
- SYS_LIBRARIES = -ltermcap
- #endif
-
-- CANNAROOT = ..
-+ CANNAROOT = .
- INSTUGIDFLAGS = -m 4755 -o root
-- CANNASRC = $(CANNAROOT)/lib/canna16
-+ CANNASRC = $(CANNAROOT)
- DEFINES = -DCANNA -DJAPANESE $(SIGNAL_DEFINES)
-- INCLUDES = -I$(CANNAROOT)/include
-+ INCLUDES = -I$(CANNAROOT) -I${PREFIX}/include
-+ LDOPTIONS = ${CANNALIB16}
-
- SRCS = header.c printf.c termio.c termcap.c ttyfdslot.c setutmp.c \
- screen.c cursor.c jhlp.c xutoj.c canna.c
-@@ -21,8 +22,12 @@
- TARGET = canuum
-
- AllTarget($(TARGET))
--NormalProgramTarget($(TARGET),$(OBJS),$(DEPCANNALIB16),$(CANNALIB16),)
-+NormalProgramTarget($(TARGET),$(OBJS),,,)
- InstallMultipleFlags($(TARGET),$(cannaBinDir),$(INSTUGIDFLAGS))
- InstallManPage($(TARGET),$(cannaManDir))
- DependTarget()
- LintTarget()
-+MakeCannaConfigH(cannaconf.h)
-+
-+clean::
-+ $(RM) -f cannaconf.h
diff --git a/japanese/canuum/patches/patch-ae b/japanese/canuum/patches/patch-ae
deleted file mode 100644
index a83b544206c..00000000000
--- a/japanese/canuum/patches/patch-ae
+++ /dev/null
@@ -1,89 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 1999/08/27 04:09:28 sakamoto Exp $
-
---- jhlp.c.orig Thu Jan 21 21:52:56 1999
-+++ jhlp.c Thu Jan 21 21:56:35 1999
-@@ -76,6 +76,9 @@
-
- jmp_buf kk_env;
-
-+#if (defined(__unix__) || defined(unix)) && !defined(USG)
-+#include <sys/param.h>
-+#endif
- #ifdef SYSVR2
- # include <sys/param.h>
- #endif /* SYSVR2 */
-@@ -285,9 +288,11 @@
-
-
- #if defined(BSD42) && !defined(DGUX)
-+#if !(defined(BSD) && (BSD >= 199306))
- if (saveutmp() < 0) {
- puts("Can't save utmp\n");
- }
-+#endif
- #endif /* BSD42 */
-
-
-@@ -781,7 +786,12 @@
- #endif
- int pid;
-
-- if ((pid = wait3(&status, WNOHANG | WUNTRACED, NULL)) == child_id) {
-+/*
-+ * Remove warning.
-+ * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp) 1996/8/20
-+ */
-+/* if ((pid = wait3(&status, WNOHANG | WUNTRACED, NULL)) == child_id) { */
-+ if ((pid = wait3((int *)&status, WNOHANG | WUNTRACED, NULL)) == child_id) {
- if (WIFSTOPPED(status)) {
- #ifdef SIGCONT
- kill(pid, SIGCONT);
-@@ -1174,9 +1184,11 @@
- setpgrp(0, pid);
- #endif /* BSD42 */
-
-+#if !(defined(BSD) && (BSD >= 199306))
- if (setutmp(ttypfd) == ERROR) {
- puts("Can't set utmp.");
- }
-+#endif
-
- #ifdef linux
- setsid();
-@@ -1634,9 +1646,11 @@
- perror(prog);
- }
-
-+#if !(defined(BSD) && (BSD >= 199306))
- if (resetutmp(ttypfd) == ERROR) {
- printf("Can't reset utmp.");
- }
-+#endif
- #ifdef TIOCSSIZE
- pty_rowcol.ts_lines = 0;
- pty_rowcol.ts_cols = 0;
-@@ -1706,11 +1720,24 @@
- char *b, *pty;
- int no;
- {
-+/*
-+ * Change pseudo-devices.
-+ * Because FreeBSD's master pseudo-devices are pty[p-sP-S][0-9a-v].
-+ * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp) 1996/8/20
-+ */
- if (no < 0x10 * ('z' - 'p' + 1)) {
-+#if (defined(BSD) && (BSD >= 199306)) /* 4.4BSD-Lite by Taoka */
-+ sprintf(b, "%s%1c%1c", pty, "pqrsPQRS"[(no >> 5)], ((no & 0x1f > 9)? 'a' : '0') + (no & 0x1f));
-+#else /* ! 4.4BSD-Lite */
- sprintf(b, "%s%1c%1x", pty, 'p' + (no >> 4), no & 0x0f);
-+#endif /* ! 4.4BSD-Lite */
- } else {
- no -= 0x10 * ('z' - 'p' + 1);
-+#if (defined(BSD) && (BSD >= 199306)) /* 4.4BSD-Lite by Taoka */
-+ sprintf(b, "%s%1c%1c", pty, "pqrsPQRS"[(no >> 5)], ((no & 0x1f > 9)? 'a' : '0') + (no & 0x1f));
-+#else /* ! 4.4BSD-Lite */
- sprintf(b, "%s%1c%1x", pty, 'P' + (no >> 4), no & 0x0f);
-+#endif /* ! 4.4BSD-Lite */
- }
- }
-
diff --git a/japanese/canuum/patches/patch-af b/japanese/canuum/patches/patch-af
deleted file mode 100644
index b746a7d16d9..00000000000
--- a/japanese/canuum/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 1999/08/27 04:09:28 sakamoto Exp $
-
---- sheader.h.orig Tue Aug 17 17:47:04 1999
-+++ sheader.h Tue Aug 17 17:48:00 1999
-@@ -336,7 +336,7 @@
- extern void set_keypad_on();
- extern void set_keypad_off();
- extern void set_scroll_region();
--#if defined(linux) || defined(__FreeBSD__) || defined(__MACHTEN__)
-+#if defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__MACHTEN__)
- #define HAVE_SETENV
- #endif
- #ifndef HAVE_SETENV
diff --git a/japanese/chasen-base/DESCR b/japanese/chasen-base/DESCR
deleted file mode 100644
index 9b1e790174d..00000000000
--- a/japanese/chasen-base/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-ChaSen, Japanese Morphological Analysis System
-
-This is base system without dictonary.
diff --git a/japanese/chasen-base/Makefile b/japanese/chasen-base/Makefile
deleted file mode 100644
index 5b47a75127e..00000000000
--- a/japanese/chasen-base/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# $NetBSD: Makefile,v 1.10 2002/02/09 07:30:20 taca Exp $
-#
-
-DISTNAME= chasen-${CHASEN_VERSION}
-PKGNAME= chasen-base-${CHASEN_VERSION}
-CATEGORIES= japanese
-MASTER_SITES= http://chasen.aist-nara.ac.jp/stable/chasen/
-
-PATCHFILES= chasen-${CHASEN_VERSION}-nmz.diff
-PATCH_SITES= ${MASTER_SITES}
-PATCH_DIST_STRIP= -p1
-
-MAINTAINER= tech-pkg-ja@jp.netbsd.org
-HOMEPAGE= http://chasen.aist-nara.ac.jp/
-COMMENT= ChaSen, Japanese Morphological Analysis System
-
-GNU_CONFIGURE= # defined
-USE_LIBTOOL= # defined
-USE_BUILDLINK_ONLY= # defined
-OWN_DIRS= ${CHASEN_DICDIR}
-
-LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
-
-.include "../chasen/Makefile.common"
-.include "../../mk/bsd.pkg.install.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/japanese/chasen-base/PLIST b/japanese/chasen-base/PLIST
deleted file mode 100644
index bdc2b1b3acf..00000000000
--- a/japanese/chasen-base/PLIST
+++ /dev/null
@@ -1,18 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/09 07:30:21 taca Exp $
-bin/chasen
-bin/chasen-config
-include/chasen.h
-lib/libchasen.a
-lib/libchasen.la
-lib/libchasen.so
-lib/libchasen.so.0
-lib/libchasen.so.0.1
-sbin/convary
-sbin/convdic
-sbin/makeint
-sbin/makemat
-sbin/mkary
-sbin/pattool
-sbin/sortdic
-@dirrm share/chasen/dic
-@dirrm share/chasen
diff --git a/japanese/chasen-base/distinfo b/japanese/chasen-base/distinfo
deleted file mode 100644
index 6aefa36cc8f..00000000000
--- a/japanese/chasen-base/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.10 2002/02/09 07:30:21 taca Exp $
-
-SHA1 (chasen-2.2.9.tar.gz) = bd17162f2fcb4254ded6eebf35c6aa06caecbaeb
-Size (chasen-2.2.9.tar.gz) = 578068 bytes
-SHA1 (chasen-2.2.9-nmz.diff) = 7aa1e01fbe7266468dcc1048e19171a0f2ff1cf8
-Size (chasen-2.2.9-nmz.diff) = 2779 bytes
-SHA1 (patch-ag) = 62326d1b540519a77cd2db5c422de78079afc1e3
-SHA1 (patch-ah) = 5993259634655c76c84bfccd72b3fa0e5aff8b61
-SHA1 (patch-ai) = 802354f200103d045de1b166215a45e7840027d8
-SHA1 (patch-aj) = eec8eb1afd762704844360949670038a60be1a02
-SHA1 (patch-ak) = 7782ce03186fcfbcbe8bcc28486f06469a1d0998
diff --git a/japanese/chasen-base/patches/patch-ag b/japanese/chasen-base/patches/patch-ag
deleted file mode 100644
index c3c63317282..00000000000
--- a/japanese/chasen-base/patches/patch-ag
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2002/02/09 07:30:21 taca Exp $
-
---- Makefile.am.orig Sat Feb 2 10:08:19 2002
-+++ Makefile.am
-@@ -1,6 +1,6 @@
- AUTOMAKE_OPTIONS = 1.4 no-dependencies
-
--SUBDIRS = doc prolog lib chasen mkchadic
-+SUBDIRS = doc lib chasen mkchadic
- EXTRA_DIRS = perl
-
- EXTRA_DIST = README-ja INSTALL-ja NEWS-ja chasen.spec
diff --git a/japanese/chasen-base/patches/patch-ah b/japanese/chasen-base/patches/patch-ah
deleted file mode 100644
index 92d9651867d..00000000000
--- a/japanese/chasen-base/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2002/02/09 07:30:21 taca Exp $
-
---- Makefile.in.orig Fri Feb 8 15:31:20 2002
-+++ Makefile.in
-@@ -80,7 +80,7 @@
-
- AUTOMAKE_OPTIONS = 1.4 no-dependencies
-
--SUBDIRS = doc prolog lib chasen mkchadic
-+SUBDIRS = doc lib chasen mkchadic
- EXTRA_DIRS = perl
-
- EXTRA_DIST = README-ja INSTALL-ja NEWS-ja chasen.spec
diff --git a/japanese/chasen-base/patches/patch-ai b/japanese/chasen-base/patches/patch-ai
deleted file mode 100644
index 757717409af..00000000000
--- a/japanese/chasen-base/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2002/02/09 07:30:22 taca Exp $
-
---- chasen-config.in.orig Thu Mar 1 08:54:17 2001
-+++ chasen-config.in
-@@ -92,7 +92,7 @@
- ;;
-
- --mkchadic)
-- echo @libexecdir@/chasen
-+ echo @sbindir@
- ;;
-
- *)
diff --git a/japanese/chasen-base/patches/patch-aj b/japanese/chasen-base/patches/patch-aj
deleted file mode 100644
index a2b52a7a8fd..00000000000
--- a/japanese/chasen-base/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2002/02/09 07:30:22 taca Exp $
-
---- mkchadic/Makefile.am.orig Sun Jun 24 15:19:02 2001
-+++ mkchadic/Makefile.am
-@@ -2,7 +2,7 @@
- LDADD = $(top_builddir)/lib/libchasen.la
- DEFS = -DRCPATH=\""$(RCPATH)\"" @DEFS@
-
--pkglibexecdir = ${libexecdir}/chasen
-+pkglibexecdir = ${sbindir}
- pkglibexec_PROGRAMS = convdic makeint makemat mkary pattool sortdic convary
-
- convdic_SOURCES = convdic.c
diff --git a/japanese/chasen-base/patches/patch-ak b/japanese/chasen-base/patches/patch-ak
deleted file mode 100644
index d6347a8fb59..00000000000
--- a/japanese/chasen-base/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2002/02/09 07:30:22 taca Exp $
-
---- mkchadic/Makefile.in.orig Fri Feb 8 15:31:51 2002
-+++ mkchadic/Makefile.in
-@@ -82,7 +82,7 @@
- LDADD = $(top_builddir)/lib/libchasen.la
- DEFS = -DRCPATH=\""$(RCPATH)\"" @DEFS@
-
--pkglibexecdir = ${libexecdir}/chasen
-+pkglibexecdir = ${sbindir}
- pkglibexec_PROGRAMS = convdic makeint makemat mkary pattool sortdic convary
-
- convdic_SOURCES = convdic.c
diff --git a/japanese/chasen/DESCR b/japanese/chasen/DESCR
deleted file mode 100644
index 6fd66ffb095..00000000000
--- a/japanese/chasen/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-ChaSen, Japanese Morphological Analysis System.
diff --git a/japanese/chasen/Makefile b/japanese/chasen/Makefile
deleted file mode 100644
index ac417d8f32c..00000000000
--- a/japanese/chasen/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: Makefile,v 1.10 2002/02/09 07:40:46 taca Exp $
-#
-
-DISTNAME= chasen-${CHASEN_VERSION}
-CATEGORIES= japanese
-MASTER_SITES= # empty
-DISTFILES= # empty
-
-MAINTAINER= tech-pkg-ja@jp.netbsd.org
-HOMEPAGE= http://chasen.aist-nara.ac.jp/
-COMMENT= ChaSen, Japanese Morphological Analysis System
-
-DEPENDS+= chasen-base>=${CHASEN_VERSION}:../../japanese/chasen-base
-DEPENDS+= ipadic>=2.4.1:../../japanese/ipadic
-
-EXTRACT_ONLY= # empty
-NO_CHECKSUM= # defined
-NO_PATCH= # defined
-NO_CONFIGURE= # defined
-NO_BUILD= # defined
-
-do-install: # empty
-
-.include "Makefile.common"
-.include "../../mk/bsd.pkg.mk"
diff --git a/japanese/chasen/Makefile.common b/japanese/chasen/Makefile.common
deleted file mode 100644
index 950960869b4..00000000000
--- a/japanese/chasen/Makefile.common
+++ /dev/null
@@ -1,8 +0,0 @@
-# $NetBSD: Makefile.common,v 1.1 2002/02/09 07:16:37 taca Exp $
-#
-
-CHASEN_VERSION= 2.2.9
-
-CHASEN_CONFDIR?= ${LOCALBASE}/etc
-CHASEN_DICDIR?= ${LOCALBASE}/share/chasen/dic
-CONFIGURE_ENV+= --sysconfdir=${CHASEN_CONFDIR}
diff --git a/japanese/chasen/PLIST b/japanese/chasen/PLIST
deleted file mode 100644
index 005f9da1c2b..00000000000
--- a/japanese/chasen/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:29:05 zuntum Exp $
-@comment this plist intentionally left empty
diff --git a/japanese/chasen/buildlink.mk b/japanese/chasen/buildlink.mk
deleted file mode 100644
index fead577c26a..00000000000
--- a/japanese/chasen/buildlink.mk
+++ /dev/null
@@ -1,49 +0,0 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/10/03 20:56:51 jlam Exp $
-#
-# This Makefile fragment is included by packages that use chasen.
-#
-# To use this Makefile fragment, simply:
-#
-# (1) Optionally define BUILDLINK_DEPENDS.chasen to the dependency pattern
-# for the version of chasen desired.
-# (2) Include this Makefile fragment in the package Makefile,
-# (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header
-# search path, and
-# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search
-# path.
-
-.if !defined(CHASEN_BUILDLINK_MK)
-CHASEN_BUILDLINK_MK= # defined
-
-.include "../../mk/bsd.buildlink.mk"
-
-BUILDLINK_DEPENDS.chasen?= chasen>=2.0
-DEPENDS+= ${BUILDLINK_DEPENDS.chasen}:../../japanese/chasen
-
-EVAL_PREFIX+= BUILDLINK_PREFIX.chasen=chasen
-BUILDLINK_PREFIX.chasen_DEFAULT= ${LOCALBASE}
-BUILDLINK_FILES.chasen= include/chasen.h
-BUILDLINK_FILES.chasen+= lib/libchasen.*
-
-BUILDLINK_TARGETS.chasen= chasen-buildlink
-BUILDLINK_TARGETS.chasen+= chasen-buildlink-config-wrapper
-BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.chasen}
-
-BUILDLINK_CONFIG.chasen= \
- ${BUILDLINK_PREFIX.chasen}/bin/chasen-config
-BUILDLINK_CONFIG_WRAPPER.chasen= \
- ${BUILDLINK_DIR}/bin/chasen-config
-REPLACE_BUILDLINK_SED+= \
- -e "s|${BUILDLINK_CONFIG_WRAPPER.chasen}|${BUILDLINK_CONFIG.chasen}|g"
-
-.if defined(USE_CONFIG_WRAPPER)
-CHASEN_CONFIG?= ${BUILDLINK_CONFIG_WRAPPER.chasen}
-CONFIGURE_ENV+= CHASEN_CONFIG="${CHASEN_CONFIG}"
-MAKE_ENV+= CHASEN_CONFIG="${CHASEN_CONFIG}"
-.endif
-
-pre-configure: ${BUILDLINK_TARGETS.chasen}
-chasen-buildlink: _BUILDLINK_USE
-chasen-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE
-
-.endif # CHASEN_BUILDLINK_MK
diff --git a/japanese/freewnn-lib/DESCR b/japanese/freewnn-lib/DESCR
deleted file mode 100644
index cd053019337..00000000000
--- a/japanese/freewnn-lib/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-FreeWnn 1.10 - Japanese Client Library
-
-This distribution contains Version 1.10 of Wnn Japanese/Chinese/Korean
-Input System. Wnn is a network-extensible Kana-to-Kanji conversion system
-and was jointly developed and released by the Software Research Group
-of Kyoto University Research Institute for Mathematical Science, OMRON
-Corporation and Astec, Inc.
diff --git a/japanese/freewnn-lib/Makefile b/japanese/freewnn-lib/Makefile
deleted file mode 100644
index b1141853517..00000000000
--- a/japanese/freewnn-lib/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2002/02/28 17:45:44 wiz Exp $
-#
-
-PKGNAME= ja-FreeWnn-lib-1.10
-CATEGORIES= japanese
-
-COMMENT= Japanese/Chinese/Korean input method (Japanese client library)
-
-WNNDIR= Wnn
-WNN_TARGET= LIBRARY
-WNN_LANG= ja_JP
-
-.include "Makefile.common"
diff --git a/japanese/freewnn-lib/Makefile.common b/japanese/freewnn-lib/Makefile.common
deleted file mode 100644
index b86fe884b59..00000000000
--- a/japanese/freewnn-lib/Makefile.common
+++ /dev/null
@@ -1,83 +0,0 @@
-# $NetBSD: Makefile.common,v 1.1 2002/02/28 17:45:44 wiz Exp $
-#
-
-DISTNAME= FreeWnn-1.10
-MASTER_SITES= ftp://ftp.freewnn.org/pub/FreeWnn/ \
- ftp://etlport.etl.go.jp/pub/FreeWnn/ \
- ftp://ftp.st.ryukoku.ac.jp/pub/japanese-im/FreeWnn/ \
- ftp://ftp.kddlabs.co.jp/Japan/Wnn/FreeWnn/ \
- ftp://ftp.tomo.gr.jp/pub/FreeWnn/
-
-MAINTAINER= tech-pkg-ja@jp.netbsd.org
-HOMEPAGE= http://www.freewnn.org/
-COMMENT= base package for japanese/freewnn-*
-
-INSTALL_TARGET= install install.man
-
-.if defined(WNN_TARGET) && (${WNN_TARGET} == "SERVER")
-.include "../../mk/bsd.prefs.mk"
-MAKE_ENV+= "WNN_TARGET=SERVER"
-WNNOWNER?= wnn
-DICT_DIR?= /var/dict
-SEDSCRIPT+= -e 's|\(WNNOWNER = \).*|\1${WNNOWNER}|'
-SEDSCRIPT+= -e 's|([CK]*WNNJLIBSRC)/\(lib[ck]*wnn.a\)|{PREFIX}/lib/\1|'
-SEDSCRIPT+= -e 's|\([JCKT]\)\(WNNDICDIR = \).*|\1\2${DICT_DIR}/wnn/$$(\1WNNLANG)|'
-INSTALL_FILE= ${WRKDIR}/INSTALL
-INSTALL_SRC= ${FILESDIR}/INSTALL
-PLIST_SUBST= DICT_DIR=${DICT_DIR} PREFIX=${PREFIX} WNN_LANG=${WNN_LANG}
-.else
-MAKE_ENV+= "WNN_TARGET=LIBRARY"
-.endif
-
-.if defined(WNNDIR)
-MAKE_ENV+= "WNNDIR=${WNNDIR}"
-.endif
-.if defined(CWNNDIR)
-MAKE_ENV+= "CWNNDIR=${CWNNDIR}"
-.endif
-.if defined(KWNNDIR)
-MAKE_ENV+= "KWNNDIR=${KWNNDIR}"
-.endif
-
-GNU_CONFIGURE= YES
-WRKSRC= ${WRKDIR}/Xsi
-
-post-patch:
- @for file in `${FIND} ${WRKSRC} -name Makefile.in`; do \
- ${MV} $$file $$file.orig; \
- ${SED} -e '/PREFIX = /d' \
- -e 's|\(WNNBINDIR = $${PREFIX}/\)\(bin\)|\1s\2|' \
- -e 's|\([CK]*WNNBINDIR = $$(WNNBINDIR)\)/[ck]*Wnn4|\1|'\
- -e 's|\(WNNWNNDIR = $${PREFIX}/\)lib\(/wnn\)|\1share\2|'\
- -e '/(COMPRESSMANCMD) /d' \
- -e 's|\/usr\/X11R6|$${PREFIX}|' \
- ${SEDSCRIPT} \
- $$file.orig > $$file; \
- done
- @for file in `${FIND} ${WRKSRC}/Wnn/man -name Makefile.in`; do \
- ${MV} $$file $$file.orig2; \
- ${SED} -e 's|\(MANPATH = .*\)|\1/ja_JP.EUC|' \
- $$file.orig2 > $$file; \
- done
- @(cd ${WRKSRC}/Wnn/include; \
- ${MV} config.h config.h.orig; \
- ${SED} -e 's|^\(\#define LIBDIR "\)/usr/local/lib\(/wnn"\)|\1${PREFIX}/share\2|' \
- config.h.orig > config.h)
-
-.if defined(WNN_TARGET) && (${WNN_TARGET} == "SERVER")
-post-build:
- @${SED} -e 's|$${WNNOWNER}|${WNNOWNER}|g' \
- ${INSTALL_SRC} > ${INSTALL_FILE}
- @${SED} -e 's|@PREFIX@|${PREFIX}|g' ${FILESDIR}/ja_freewnn \
- > ${WRKDIR}/ja_freewnn
-
-pre-install:
- @${SETENV} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL
-
-post-install:
- @${LN} -s ${DICT_DIR}/wnn/${WNN_LANG} \
- ${PREFIX}/share/wnn/${WNN_LANG}/dic
- @${INSTALL_SCRIPT} ${WRKDIR}/ja_freewnn ${PREFIX}/etc/rc.d/ja_freewnn
-.endif
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/japanese/freewnn-lib/PLIST b/japanese/freewnn-lib/PLIST
deleted file mode 100644
index c73edb8e2bd..00000000000
--- a/japanese/freewnn-lib/PLIST
+++ /dev/null
@@ -1,240 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:29:07 zuntum Exp $
-include/wnn/commonhd.h
-include/wnn/config.h
-include/wnn/cplib.h
-include/wnn/jlib.h
-include/wnn/jllib.h
-include/wnn/jslib.h
-include/wnn/msg.h
-include/wnn/rk_spclval.h
-include/wnn/wnnerror.h
-lib/libjd.a
-lib/libwnn.a
-man/ja_JP.EUC/man3/jl_bun_suu.3
-man/ja_JP.EUC/man3/jl_c_zenkouho.3
-man/ja_JP.EUC/man3/jl_close.3
-man/ja_JP.EUC/man3/jl_connect.3
-man/ja_JP.EUC/man3/jl_connect_lang.3
-man/ja_JP.EUC/man3/jl_dai_top.3
-man/ja_JP.EUC/man3/jl_dic_add.3
-man/ja_JP.EUC/man3/jl_dic_add_e.3
-man/ja_JP.EUC/man3/jl_dic_comment_set.3
-man/ja_JP.EUC/man3/jl_dic_comment_set_e.3
-man/ja_JP.EUC/man3/jl_dic_delete.3
-man/ja_JP.EUC/man3/jl_dic_delete_e.3
-man/ja_JP.EUC/man3/jl_dic_list.3
-man/ja_JP.EUC/man3/jl_dic_list_e.3
-man/ja_JP.EUC/man3/jl_dic_save.3
-man/ja_JP.EUC/man3/jl_dic_save_all.3
-man/ja_JP.EUC/man3/jl_dic_save_all_e.3
-man/ja_JP.EUC/man3/jl_dic_save_e.3
-man/ja_JP.EUC/man3/jl_dic_use.3
-man/ja_JP.EUC/man3/jl_dic_use_e.3
-man/ja_JP.EUC/man3/jl_disconnect.3
-man/ja_JP.EUC/man3/jl_env.3
-man/ja_JP.EUC/man3/jl_env_get.3
-man/ja_JP.EUC/man3/jl_env_set.3
-man/ja_JP.EUC/man3/jl_env_sticky.3
-man/ja_JP.EUC/man3/jl_env_sticky_e.3
-man/ja_JP.EUC/man3/jl_env_un_sticky.3
-man/ja_JP.EUC/man3/jl_env_un_sticky_e.3
-man/ja_JP.EUC/man3/jl_fuzokugo_get.3
-man/ja_JP.EUC/man3/jl_fuzokugo_get_e.3
-man/ja_JP.EUC/man3/jl_fuzokugo_set.3
-man/ja_JP.EUC/man3/jl_fuzokugo_set_e.3
-man/ja_JP.EUC/man3/jl_get_kanji.3
-man/ja_JP.EUC/man3/jl_get_yomi.3
-man/ja_JP.EUC/man3/jl_get_zenkouho_kanji.3
-man/ja_JP.EUC/man3/jl_hinsi_dicts.3
-man/ja_JP.EUC/man3/jl_hinsi_dicts_e.3
-man/ja_JP.EUC/man3/jl_hinsi_list.3
-man/ja_JP.EUC/man3/jl_hinsi_list_e.3
-man/ja_JP.EUC/man3/jl_hinsi_name.3
-man/ja_JP.EUC/man3/jl_hinsi_name_e.3
-man/ja_JP.EUC/man3/jl_hinsi_number.3
-man/ja_JP.EUC/man3/jl_hinsi_number_e.3
-man/ja_JP.EUC/man3/jl_inspect.3
-man/ja_JP.EUC/man3/jl_isconnect.3
-man/ja_JP.EUC/man3/jl_isconnect_e.3
-man/ja_JP.EUC/man3/jl_jiri_len.3
-man/ja_JP.EUC/man3/jl_kanji_len.3
-man/ja_JP.EUC/man3/jl_kill.3
-man/ja_JP.EUC/man3/jl_next.3
-man/ja_JP.EUC/man3/jl_next_dai.3
-man/ja_JP.EUC/man3/jl_nobi_conv.3
-man/ja_JP.EUC/man3/jl_open.3
-man/ja_JP.EUC/man3/jl_open_lang.3
-man/ja_JP.EUC/man3/jl_param_get.3
-man/ja_JP.EUC/man3/jl_param_get_e.3
-man/ja_JP.EUC/man3/jl_param_set.3
-man/ja_JP.EUC/man3/jl_param_set_e.3
-man/ja_JP.EUC/man3/jl_previous.3
-man/ja_JP.EUC/man3/jl_previous_dai.3
-man/ja_JP.EUC/man3/jl_ren_conv.3
-man/ja_JP.EUC/man3/jl_set_env_wnnrc.3
-man/ja_JP.EUC/man3/jl_set_jikouho.3
-man/ja_JP.EUC/man3/jl_set_jikouho_dai.3
-man/ja_JP.EUC/man3/jl_tan_conv.3
-man/ja_JP.EUC/man3/jl_update_hindo.3
-man/ja_JP.EUC/man3/jl_word_add.3
-man/ja_JP.EUC/man3/jl_word_add_e.3
-man/ja_JP.EUC/man3/jl_word_comment_set.3
-man/ja_JP.EUC/man3/jl_word_comment_set_e.3
-man/ja_JP.EUC/man3/jl_word_delete.3
-man/ja_JP.EUC/man3/jl_word_delete_e.3
-man/ja_JP.EUC/man3/jl_word_info.3
-man/ja_JP.EUC/man3/jl_word_info_e.3
-man/ja_JP.EUC/man3/jl_word_search.3
-man/ja_JP.EUC/man3/jl_word_search_by_env.3
-man/ja_JP.EUC/man3/jl_word_search_by_env_e.3
-man/ja_JP.EUC/man3/jl_word_search_e.3
-man/ja_JP.EUC/man3/jl_word_use.3
-man/ja_JP.EUC/man3/jl_word_use_e.3
-man/ja_JP.EUC/man3/jl_yomi_len.3
-man/ja_JP.EUC/man3/jl_zenkouho.3
-man/ja_JP.EUC/man3/jl_zenkouho_bun.3
-man/ja_JP.EUC/man3/jl_zenkouho_dai.3
-man/ja_JP.EUC/man3/jl_zenkouho_daip.3
-man/ja_JP.EUC/man3/jl_zenkouho_suu.3
-man/ja_JP.EUC/man3/js_access.3
-man/ja_JP.EUC/man3/js_close.3
-man/ja_JP.EUC/man3/js_connect.3
-man/ja_JP.EUC/man3/js_dic_add.3
-man/ja_JP.EUC/man3/js_dic_delete.3
-man/ja_JP.EUC/man3/js_dic_file_create.3
-man/ja_JP.EUC/man3/js_dic_file_create_client.3
-man/ja_JP.EUC/man3/js_dic_info.3
-man/ja_JP.EUC/man3/js_dic_list.3
-man/ja_JP.EUC/man3/js_dic_list_all.3
-man/ja_JP.EUC/man3/js_dic_use.3
-man/ja_JP.EUC/man3/js_disconnect.3
-man/ja_JP.EUC/man3/js_env_exist.3
-man/ja_JP.EUC/man3/js_env_list.3
-man/ja_JP.EUC/man3/js_env_sticky.3
-man/ja_JP.EUC/man3/js_env_un_sticky.3
-man/ja_JP.EUC/man3/js_file_comment_set.3
-man/ja_JP.EUC/man3/js_file_discard.3
-man/ja_JP.EUC/man3/js_file_info.3
-man/ja_JP.EUC/man3/js_file_list.3
-man/ja_JP.EUC/man3/js_file_list_all.3
-man/ja_JP.EUC/man3/js_file_loaded.3
-man/ja_JP.EUC/man3/js_file_loaded_local.3
-man/ja_JP.EUC/man3/js_file_password_set.3
-man/ja_JP.EUC/man3/js_file_read.3
-man/ja_JP.EUC/man3/js_file_receive.3
-man/ja_JP.EUC/man3/js_file_remove.3
-man/ja_JP.EUC/man3/js_file_remove_client.3
-man/ja_JP.EUC/man3/js_file_send.3
-man/ja_JP.EUC/man3/js_file_stat.3
-man/ja_JP.EUC/man3/js_file_write.3
-man/ja_JP.EUC/man3/js_fuzokugo_get.3
-man/ja_JP.EUC/man3/js_fuzokugo_set.3
-man/ja_JP.EUC/man3/js_get_lang.3
-man/ja_JP.EUC/man3/js_hindo_file_create.3
-man/ja_JP.EUC/man3/js_hindo_file_create_client.3
-man/ja_JP.EUC/man3/js_hindo_set.3
-man/ja_JP.EUC/man3/js_hinsi_dicts.3
-man/ja_JP.EUC/man3/js_hinsi_list.3
-man/ja_JP.EUC/man3/js_hinsi_name.3
-man/ja_JP.EUC/man3/js_hinsi_number.3
-man/ja_JP.EUC/man3/js_hinsi_table_set.3
-man/ja_JP.EUC/man3/js_isconnect.3
-man/ja_JP.EUC/man3/js_kanren.3
-man/ja_JP.EUC/man3/js_kantan_dai.3
-man/ja_JP.EUC/man3/js_kantan_sho.3
-man/ja_JP.EUC/man3/js_kanzen_dai.3
-man/ja_JP.EUC/man3/js_kanzen_sho.3
-man/ja_JP.EUC/man3/js_kill.3
-man/ja_JP.EUC/man3/js_mkdir.3
-man/ja_JP.EUC/man3/js_open.3
-man/ja_JP.EUC/man3/js_open_lang.3
-man/ja_JP.EUC/man3/js_param_get.3
-man/ja_JP.EUC/man3/js_param_set.3
-man/ja_JP.EUC/man3/js_set_lang.3
-man/ja_JP.EUC/man3/js_version.3
-man/ja_JP.EUC/man3/js_who.3
-man/ja_JP.EUC/man3/js_word_add.3
-man/ja_JP.EUC/man3/js_word_comment_set.3
-man/ja_JP.EUC/man3/js_word_delete.3
-man/ja_JP.EUC/man3/js_word_info.3
-man/ja_JP.EUC/man3/js_word_search.3
-man/ja_JP.EUC/man3/js_word_search_by_env.3
-man/ja_JP.EUC/man3/msg_close.3
-man/ja_JP.EUC/man3/msg_get.3
-man/ja_JP.EUC/man3/msg_open.3
-man/ja_JP.EUC/man3/romkan_clear.3
-man/ja_JP.EUC/man3/romkan_dispmode.3
-man/ja_JP.EUC/man3/romkan_getc.3
-man/ja_JP.EUC/man3/romkan_init.3
-man/ja_JP.EUC/man3/romkan_next.3
-man/ja_JP.EUC/man3/romkan_ungetc.3
-share/wnn/cvt_key_empty
-share/wnn/cvt_key_tbl
-share/wnn/cvt_key_tbl.ST
-share/wnn/cvt_key_tbl.gm
-share/wnn/cvt_key_tbl.kt
-share/wnn/cvt_key_tbl.mv
-share/wnn/cvt_key_tbl.vt
-share/wnn/ja_JP/hinsi.data
-share/wnn/ja_JP/jserverrc
-share/wnn/ja_JP/libwnn.msg
-share/wnn/ja_JP/rk.vi/1B_newTOUPPER
-share/wnn/ja_JP/rk.vi/2A_CTRL
-share/wnn/ja_JP/rk.vi/2B_KEISEN
-share/wnn/ja_JP/rk.vi/2B_ROMKANA
-share/wnn/ja_JP/rk.vi/2C_KEISEN1
-share/wnn/ja_JP/rk.vi/2C_VI
-share/wnn/ja_JP/rk.vi/2C_VIEX
-share/wnn/ja_JP/rk.vi/2C_VISH
-share/wnn/ja_JP/rk.vi/2_VITHROW
-share/wnn/ja_JP/rk.vi/3B_ZENASC
-share/wnn/ja_JP/rk.vi/mode
-share/wnn/ja_JP/rk.vi/uumkey
-share/wnn/ja_JP/rk/1B_TOUPPER
-share/wnn/ja_JP/rk/1B_ZENHIRA
-share/wnn/ja_JP/rk/1B_ZENKATA
-share/wnn/ja_JP/rk/1B_newTOUPPER
-share/wnn/ja_JP/rk/2A_CTRL
-share/wnn/ja_JP/rk/2B_DAKUTEN
-share/wnn/ja_JP/rk/2B_JIS
-share/wnn/ja_JP/rk/2B_ROMKANA
-share/wnn/ja_JP/rk/2_TCODE
-share/wnn/ja_JP/rk/3B_HANKATA
-share/wnn/ja_JP/rk/3B_KATAKANA
-share/wnn/ja_JP/rk/3B_ZENKAKU
-share/wnn/ja_JP/rk/autork
-share/wnn/ja_JP/rk/mode
-share/wnn/ja_JP/rk/mode.hankata
-share/wnn/ja_JP/rk/mode.nohankata
-share/wnn/ja_JP/uum.msg
-share/wnn/ja_JP/uumkey
-share/wnn/ja_JP/uumkey.omr
-share/wnn/ja_JP/uumkey_e
-share/wnn/ja_JP/uumrc
-share/wnn/ja_JP/uumrc.omr
-share/wnn/ja_JP/uumrc.rev
-share/wnn/ja_JP/uumrc_e
-share/wnn/ja_JP/uumrc_vi
-share/wnn/ja_JP/wnnenvrc
-share/wnn/ja_JP/wnnenvrc.omr
-share/wnn/ja_JP/wnnenvrc.rem
-share/wnn/ja_JP/wnnenvrc.rev
-share/wnn/ja_JP/wnnenvrc_R
-share/wnn/ja_JP/wnnenvrc_R.omr
-share/wnn/ja_JP/wnnenvrc_R.rem
-share/wnn/ja_JP/wnnstat.msg
-share/wnn/lt_LN/rk/2A_CTRL
-share/wnn/lt_LN/rk/2B_LATIN
-share/wnn/lt_LN/rk/mode
-share/wnn/lt_LN/uum.msg
-share/wnn/lt_LN/uumkey
-share/wnn/lt_LN/uumkey_e
-share/wnn/lt_LN/uumrc
-share/wnn/serverdefs
-@dirrm share/wnn/lt_LN/rk
-@dirrm share/wnn/lt_LN
-@dirrm share/wnn/ja_JP/rk.vi
-@dirrm share/wnn/ja_JP/rk
-@dirrm share/wnn/ja_JP
-@dirrm share/wnn
-@dirrm include/wnn
diff --git a/japanese/freewnn-lib/distinfo b/japanese/freewnn-lib/distinfo
deleted file mode 100644
index 59e71abc29b..00000000000
--- a/japanese/freewnn-lib/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.3 2002/03/22 03:48:54 uebayasi Exp $
-
-SHA1 (FreeWnn-1.10.tar.gz) = 66a0640d4632d82b7012c4aa2239bc1d69d45034
-Size (FreeWnn-1.10.tar.gz) = 3468613 bytes
-SHA1 (patch-aa) = d2385eefe88c460fbaa176f1ca278f005dad0352
-SHA1 (patch-ab) = 20712663f68f63834d47bfadedfead537dbfa050
-SHA1 (patch-ac) = d74f31402088268df65dfdc4046242fec349ba88
-SHA1 (patch-ad) = b92228c7a2b24f3ed4b8c39a5893e65731120c56
-SHA1 (patch-ae) = d0b4c079859603c42ae957c7b413f4272a054f58
-SHA1 (patch-af) = 26d45af3c65df5af5299c837a123129ec5919bd4
-SHA1 (patch-ag) = c70655f9057f0372cc9f0208535e0f39281f82aa
diff --git a/japanese/freewnn-lib/files/INSTALL b/japanese/freewnn-lib/files/INSTALL
deleted file mode 100644
index 5b0b37e7686..00000000000
--- a/japanese/freewnn-lib/files/INSTALL
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-case $2 in
-PRE-INSTALL)
- uid=`id -u ${WNNOWNER} 2> /dev/null`
- if [ X"$uid" != X ]; then
- exit 0
- fi
-
- wnn_uid=69
- uid=`id -u $wnn_uid 2> /dev/null`
- if [ X"$uid" != X ]; then
- wnn_uid=32768
- while id -u $wnn_uid > /dev/null 2>&1; do
- wnn_uid=`echo $wnn_uid+1|bc`
- if [ $wnn_uid = 65536 ]; then
- exit 1
- fi
- done
- fi
- chpass -l -a "${WNNOWNER}:*:$wnn_uid:1::0:0:User Wnn:/nonexistent:/sbin/nologin"
- exit $?
- ;;
-esac
diff --git a/japanese/freewnn-lib/files/ja_freewnn b/japanese/freewnn-lib/files/ja_freewnn
deleted file mode 100644
index 53d75e7b55d..00000000000
--- a/japanese/freewnn-lib/files/ja_freewnn
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: ja_freewnn,v 1.1 2002/02/28 17:45:45 wiz Exp $
-#
-# PROVIDE: freewnn
-# REQUIRE: DAEMON
-
-. /etc/rc.subr
-
-name="freewnn"
-command_start="@PREFIX@/sbin/jserver"
-command_stop="@PREFIX@/sbin/wnnkill"
-pidfile=""
-
-cmd=${1:-start}
-
-case ${cmd} in
-start)
- if [ -x ${command_start} ]; then
- echo "Starting ${name}."
- ${command_start} >/dev/null 2>&1
- fi
- ;;
-stop)
- if [ -x ${command_stop} ]; then
- echo "Stopping ${name}."
- ${command_stop} >/dev/null 2>&1
- fi
- ;;
-*)
- :
- ;;
-esac
-exit 0
diff --git a/japanese/freewnn-lib/patches/patch-aa b/japanese/freewnn-lib/patches/patch-aa
deleted file mode 100644
index 7e052c5b763..00000000000
--- a/japanese/freewnn-lib/patches/patch-aa
+++ /dev/null
@@ -1,51 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2002/02/28 17:45:45 wiz Exp $
-
---- ./Wnn/Makefile.in.orig Tue Mar 23 21:10:52 1999
-+++ ./Wnn/Makefile.in Thu Sep 2 19:21:52 1999
-@@ -611,6 +611,4 @@
- # Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
--WNNOWNER= wnn
--
- JSERVERDIR = jserver
-
-@@ -629,9 +627,15 @@
- JDDIR = jd
-
--WNNMANDIR = man
--
- JLIBV3DIR = jlib.V3
-
--SUBDIRS = $(JDDIR) $(JSERVERDIR) $(JLIBDIR) $(WNNCLIENTSDIR) $(WNNJUTILDIR) $(PUBDICDIR) $(WNNCONSDIR) $(WNNMANDIR) $(WNNENVDIR) $(JLIBV3DIR)
-+.if (${WNN_TARGET} == "SERVER")
-+WNNMANDIR = man/2.env man/4.cmd man/6.jutil
-+SUBDIRS_INST = $(JSERVERDIR) $(WNNJUTILDIR) $(PUBDICDIR) $(WNNCONSDIR) $(WNNMANDIR)
-+SUBDIRS = $(JDDIR) $(SUBDIRS_INST)
-+.else
-+WNNMANDIR = man/3.libwnn
-+SUBDIRS_INST = $(JDDIR) $(JLIBDIR) $(WNNCLIENTSDIR) $(WNNMANDIR) $(WNNENVDIR) $(JLIBV3DIR)
-+SUBDIRS = $(SUBDIRS_INST)
-+.endif
-
- all::
-@@ -699,5 +703,5 @@
- @for flag in ${MAKEFLAGS} ''; do \
- case "$$flag" in *=*) ;; *[ik]*) set +e;; esac; done; \
-- for i in $(SUBDIRS) ;\
-+ for i in $(SUBDIRS_INST) ;\
- do \
- echo "installing" "in $(CURRENT_DIR)/$$i..."; \
-@@ -709,5 +713,5 @@
- @for flag in ${MAKEFLAGS} ''; do \
- case "$$flag" in *=*) ;; *[ik]*) set +e;; esac; done; \
-- for i in $(SUBDIRS) ;\
-+ for i in $(SUBDIRS_INST) ;\
- do \
- echo "installing man pages" "in $(CURRENT_DIR)/$$i..."; \
-@@ -719,5 +723,5 @@
- @for flag in ${MAKEFLAGS} ''; do \
- case "$$flag" in *=*) ;; *[ik]*) set +e;; esac; done; \
-- for i in $(SUBDIRS) ;\
-+ for i in $(SUBDIRS_INST) ;\
- do \
- echo "installing link kit" "in $(CURRENT_DIR)/$$i..."; \
diff --git a/japanese/freewnn-lib/patches/patch-ab b/japanese/freewnn-lib/patches/patch-ab
deleted file mode 100644
index d6bd4a2439e..00000000000
--- a/japanese/freewnn-lib/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2002/02/28 17:45:45 wiz Exp $
-
---- ./cWnn/Makefile.in.orig Tue Mar 23 21:13:41 1999
-+++ ./cWnn/Makefile.in Thu Sep 2 19:26:52 1999
-@@ -621,6 +621,4 @@
- # Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
--WNNOWNER = wnn
--
- JSERVERDIR = jserver
-
-@@ -641,5 +639,9 @@
- WNNMANDIR = man
-
--SUBDIRS = $(JLIBDIR) $(CDDIR) $(JSERVERDIR) $(WNNCLIENTSDIR) $(WNNJUTILDIR) $(CDICDIR) $(TDICDIR) $(WNNMANDIR) $(TDDIR)
-+.if (${WNN_TARGET} == "SERVER")
-+SUBDIRS = $(JSERVERDIR) $(WNNJUTILDIR) $(CDICDIR) $(TDICDIR) $(WNNMANDIR)
-+.else
-+SUBDIRS = $(JLIBDIR) $(CDDIR) $(WNNCLIENTSDIR) $(TDDIR)
-+.endif
-
- all::
diff --git a/japanese/freewnn-lib/patches/patch-ac b/japanese/freewnn-lib/patches/patch-ac
deleted file mode 100644
index a2b3faa31eb..00000000000
--- a/japanese/freewnn-lib/patches/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2002/02/28 17:45:45 wiz Exp $
-
---- ./kWnn/Makefile.in.orig Tue Mar 23 21:14:47 1999
-+++ ./kWnn/Makefile.in Thu Sep 2 19:29:22 1999
-@@ -621,6 +621,4 @@
- # Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
--WNNOWNER = wnn
--
- JSERVERDIR = jserver
-
-@@ -635,5 +633,9 @@
- KDDIR = include kd
-
--SUBDIRS = $(KDDIR) etc $(JLIBDIR) $(JSERVERDIR) $(WNNCLIENTSDIR) $(WNNJUTILDIR) $(KDICDIR) $(WNNMANDIR)
-+.if (${WNN_TARGET} == "SERVER")
-+SUBDIRS = etc $(JSERVERDIR) $(WNNJUTILDIR) $(KDICDIR) $(WNNMANDIR)
-+.else
-+SUBDIRS = $(KDDIR) $(JLIBDIR) $(WNNCLIENTSDIR)
-+.endif
-
- all::
diff --git a/japanese/freewnn-lib/patches/patch-ad b/japanese/freewnn-lib/patches/patch-ad
deleted file mode 100644
index e9f463e5940..00000000000
--- a/japanese/freewnn-lib/patches/patch-ad
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2002/03/22 03:48:55 uebayasi Exp $
-
---- configure.in.orig Tue Apr 6 12:12:19 1999
-+++ configure.in
-@@ -54,12 +54,17 @@
- CPP=/lib/cpp
- fi
- ;;
--"FreeBSD")
-+"FreeBSD" | "OpenBSD")
- CCOPTIONS="-DCSRG_BASED"
- CDEBUGFLAGS="-O2 -fno-strength-reduce"
- if test -x /usr/libexec/cpp; then
- CPP=/usr/libexec/cpp
- fi
-+ ;;
-+"NetBSD")
-+ CCOPTIONS="-DCSRG_BASED"
-+ CDEBUGFLAGS="-O2 -fno-strength-reduce"
-+ CPP=/usr/bin/cpp
- ;;
- "SunOS")
- if test $CC = gcc; then
diff --git a/japanese/freewnn-lib/patches/patch-ae b/japanese/freewnn-lib/patches/patch-ae
deleted file mode 100644
index 7e6e996e841..00000000000
--- a/japanese/freewnn-lib/patches/patch-ae
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2002/03/22 03:48:55 uebayasi Exp $
-
---- configure.orig Tue Apr 6 12:12:18 1999
-+++ configure
-@@ -704,12 +704,17 @@
- CPP=/lib/cpp
- fi
- ;;
--"FreeBSD")
-+"FreeBSD" | "OpenBSD")
- CCOPTIONS="-DCSRG_BASED"
- CDEBUGFLAGS="-O2 -fno-strength-reduce"
- if test -x /usr/libexec/cpp; then
- CPP=/usr/libexec/cpp
- fi
-+ ;;
-+"NetBSD")
-+ CCOPTIONS="-DCSRG_BASED"
-+ CDEBUGFLAGS="-O2 -fno-strength-reduce"
-+ CPP=/usr/bin/cpp
- ;;
- "SunOS")
- if test $CC = gcc; then
diff --git a/japanese/freewnn-lib/patches/patch-af b/japanese/freewnn-lib/patches/patch-af
deleted file mode 100644
index 2ce860bd8b6..00000000000
--- a/japanese/freewnn-lib/patches/patch-af
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-af,v 1.1 2002/02/28 17:45:45 wiz Exp $
-
---- ./Makefile.in.orig Tue Mar 23 21:10:39 1999
-+++ ./Makefile.in Thu Sep 2 14:57:48 1999
-@@ -611,10 +611,4 @@
- # Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
--WNNDIR = Wnn
--
--CWNNDIR = cWnn
--
--KWNNDIR = kWnn
--
- SUBDIRS= $(WNNDIR) $(CWNNDIR) $(KWNNDIR)
-
diff --git a/japanese/freewnn-lib/patches/patch-ag b/japanese/freewnn-lib/patches/patch-ag
deleted file mode 100644
index d0b68750404..00000000000
--- a/japanese/freewnn-lib/patches/patch-ag
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2002/02/28 17:45:45 wiz Exp $
-
---- Wnn/jlib/js.c.orig Mon May 17 12:04:45 1999
-+++ Wnn/jlib/js.c Wed Sep 22 18:37:26 1999
-@@ -221,9 +221,9 @@
- return -1;
- }
--#if !(defined(BSD) && (BSD >= 199306)) /* !4.4BSD-Lite */
-- if (connect(sd,(struct sockaddr *)&saddr,strlen(saddr.sun_path)+sizeof(saddr.sun_family)) == ERROR) {
--#else /* 4.4BSD-Lite */
-+
-+#if !defined(SUN_LEN)
-+# define SUN_LEN(su) (sizeof(*(su)) - sizeof((su)->sun_path) + strlen((su)->sun_path))
-+#endif
- if (connect(sd,(struct sockaddr *)&saddr,SUN_LEN(&saddr)) == ERROR) {
--#endif /* 4.4BSD-Lite */
-
- #if DEBUG
diff --git a/japanese/freewnn-server/DESCR b/japanese/freewnn-server/DESCR
deleted file mode 100644
index d183920e64c..00000000000
--- a/japanese/freewnn-server/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-FreeWnn 1.10 - Japanese Server
-
-This distribution contains Version 1.10 of Wnn Japanese/Chinese/Korean
-Input System. Wnn is a network-extensible Kana-to-Kanji conversion system
-and was jointly developed and released by the Software Research Group
-of Kyoto University Research Institute for Mathematical Science, OMRON
-Corporation and Astec, Inc.
diff --git a/japanese/freewnn-server/Makefile b/japanese/freewnn-server/Makefile
deleted file mode 100644
index 9174fd2ad5d..00000000000
--- a/japanese/freewnn-server/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2002/02/28 17:45:45 wiz Exp $
-#
-
-PKGNAME= ja-FreeWnn-server-1.10
-CATEGORIES= japanese
-DEPENDS+= ja-FreeWnn-lib-1.10:../../japanese/freewnn-lib
-
-COMMENT= Japanese/Chinese/Korean input method (Japanese server)
-
-WNNDIR= Wnn
-WNN_TARGET= SERVER
-WNN_LANG= ja_JP
-
-FILESDIR= ${.CURDIR}/../../japanese/freewnn-lib/files
-PATCHDIR= ${.CURDIR}/../../japanese/freewnn-lib/patches
-
-.include "../../japanese/freewnn-lib/Makefile.common"
diff --git a/japanese/freewnn-server/PLIST b/japanese/freewnn-server/PLIST
deleted file mode 100644
index 25503655384..00000000000
--- a/japanese/freewnn-server/PLIST
+++ /dev/null
@@ -1,70 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:45 skrll Exp $
-@cwd ${DICT_DIR}
-@cwd ${DICT_DIR}
-wnn/ja_JP/pubdic/bio.dic
-wnn/ja_JP/pubdic/chimei.dic
-wnn/ja_JP/pubdic/computer.dic
-wnn/ja_JP/pubdic/full.fzk
-wnn/ja_JP/pubdic/jinmei.dic
-wnn/ja_JP/pubdic/kihon.dic
-wnn/ja_JP/pubdic/kougo.fzk
-wnn/ja_JP/pubdic/koyuu.dic
-wnn/ja_JP/pubdic/setsuji.dic
-wnn/ja_JP/pubdic/special.dic
-wnn/ja_JP/pubdic/std.fzk
-wnn/ja_JP/pubdic/symbol.dic
-wnn/ja_JP/pubdic/tankan.dic
-wnn/ja_JP/src/fzk.attr
-wnn/ja_JP/src/fzk.con
-wnn/ja_JP/src/fzk.fzkattr
-wnn/ja_JP/src/fzk.jirattr
-wnn/ja_JP/src/fzk.jircon
-wnn/ja_JP/src/fzk.master
-wnn/ja_JP/src/fzk.shuutan
-wnn/ja_JP/wnncons/tankan2.dic
-wnn/ja_JP/wnncons/tankan3.dic
-@dirrm wnn/ja_JP/wnncons
-@dirrm wnn/ja_JP/src
-@dirrm wnn/ja_JP/pubdic
-@dirrm wnn/ja_JP
-@dirrm wnn
-@cwd ${PREFIX}
-man/ja_JP.EUC/man1/atod.1
-man/ja_JP.EUC/man1/atof.1
-man/ja_JP.EUC/man1/dtoa.1
-man/ja_JP.EUC/man1/jserver.1
-man/ja_JP.EUC/man1/oldatonewa.1
-man/ja_JP.EUC/man1/uum.1
-man/ja_JP.EUC/man1/wddel.1
-man/ja_JP.EUC/man1/wdreg.1
-man/ja_JP.EUC/man1/wnnkill.1
-man/ja_JP.EUC/man1/wnnstat.1
-man/ja_JP.EUC/man1/wnntouch.1
-man/ja_JP.EUC/man4/2a_ctrl.4
-man/ja_JP.EUC/man4/2b_romkana.4
-man/ja_JP.EUC/man4/cvt_key_tbl.4
-man/ja_JP.EUC/man4/fzk.data.4
-man/ja_JP.EUC/man4/fzk.u.4
-man/ja_JP.EUC/man4/hinsi_data.4
-man/ja_JP.EUC/man4/jserverrc.4
-man/ja_JP.EUC/man4/mode.4
-man/ja_JP.EUC/man4/serverdefs.4
-man/ja_JP.EUC/man4/ujis_dic.4
-man/ja_JP.EUC/man4/uumkey.4
-man/ja_JP.EUC/man4/uumrc.4
-man/ja_JP.EUC/man4/wnnenvrc.4
-man/ja_JP.EUC/man5/pubdic.5
-man/ja_JP.EUC/man5/usr_dic.5
-sbin/atod
-sbin/atof
-sbin/dtoa
-sbin/jserver
-sbin/oldatonewa
-sbin/wddel
-sbin/wdreg
-sbin/wnnkill
-sbin/wnnstat
-sbin/wnntouch
-etc/rc.d/ja_freewnn
-@exec ln -s ${DICT_DIR}/wnn/ja_JP %D/share/wnn/ja_JP/dic
-@unexec ${RM} %D/share/wnn/ja_JP/dic
diff --git a/japanese/freewnn-server/distinfo b/japanese/freewnn-server/distinfo
deleted file mode 100644
index 4224abd5950..00000000000
--- a/japanese/freewnn-server/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.3 2002/03/22 08:05:08 uebayasi Exp $
-
-SHA1 (FreeWnn-1.10.tar.gz) = 66a0640d4632d82b7012c4aa2239bc1d69d45034
-Size (FreeWnn-1.10.tar.gz) = 3468613 bytes
-SHA1 (patch-aa) = d2385eefe88c460fbaa176f1ca278f005dad0352
-SHA1 (patch-ab) = 20712663f68f63834d47bfadedfead537dbfa050
-SHA1 (patch-ac) = d74f31402088268df65dfdc4046242fec349ba88
-SHA1 (patch-ad) = b92228c7a2b24f3ed4b8c39a5893e65731120c56
-SHA1 (patch-ae) = d0b4c079859603c42ae957c7b413f4272a054f58
-SHA1 (patch-af) = 26d45af3c65df5af5299c837a123129ec5919bd4
-SHA1 (patch-ag) = c70655f9057f0372cc9f0208535e0f39281f82aa
diff --git a/japanese/gawk/DESCR b/japanese/gawk/DESCR
deleted file mode 100644
index e944f89089d..00000000000
--- a/japanese/gawk/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-This package is multi-byte extented GNU AWK.
-Supported multi-byte codes are EUC/Shift-JIS/UTF8 code.
-
-Multi-byte code by WILLs(Katsuyuki Okabe, hgc02147@nifty.ne.jp)
-and t^2(Takahiro Tanimoto, NBC02362@niftyserve.or.jp).
diff --git a/japanese/gawk/Makefile b/japanese/gawk/Makefile
deleted file mode 100644
index 3cccd7699ed..00000000000
--- a/japanese/gawk/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: Makefile,v 1.7 2002/02/18 15:14:22 seb Exp $
-# FreeBSD Id: Makefile,v 1.13 1999/01/27 07:41:14 fenner Exp $
-
-DISTNAME= gawk-3.0.4
-PKGNAME= ja-gawk-3.0.4
-CATEGORIES= japanese textproc
-MASTER_SITES= ${MASTER_SITE_GNU:=gawk/}
-
-PATCH_SITES= http://member.nifty.ne.jp/wills/program/
-PATCHFILES= gawkmb112.diff.gz
-PATCH_DIST_STRIP= -p1
-
-MAINTAINER= tech-pkg-ja@jp.netbsd.org
-HOMEPAGE= http://www.gnu.org/software/gawk/gawk.html
-COMMENT= GNU awk + multi-byte extension
-
-INFO_FILES= gawk.info
-
-GNU_CONFIGURE= yes
-
-post-install:
- @${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ja-gawk
- @${INSTALL_DATA} ${WRKSRC}/OREADME.MB ${PREFIX}/share/doc/ja-gawk
- @${INSTALL_DATA} ${WRKSRC}/README.MB ${PREFIX}/share/doc/ja-gawk
-
-.include "../../mk/texinfo.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/japanese/gawk/PLIST b/japanese/gawk/PLIST
deleted file mode 100644
index f3539edfd07..00000000000
--- a/japanese/gawk/PLIST
+++ /dev/null
@@ -1,27 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:22 seb Exp $
-bin/jgawk
-bin/jigawk
-@unexec ${INSTALL_INFO} --delete %D/info/gawk.info %D/info/dir
-info/gawk.info
-@exec ${INSTALL_INFO} %D/info/gawk.info %D/info/dir
-libexec/awk/grcat
-libexec/awk/pwcat
-man/man1/jgawk.1
-man/man1/jigawk.1
-share/awk/assert.awk
-share/awk/ctime.awk
-share/awk/ftrans.awk
-share/awk/getopt.awk
-share/awk/gettime.awk
-share/awk/group.awk
-share/awk/join.awk
-share/awk/mktime.awk
-share/awk/nextfile.awk
-share/awk/ord.awk
-share/awk/passwd.awk
-share/awk/round.awk
-share/doc/ja-gawk/OREADME.MB
-share/doc/ja-gawk/README.MB
-@dirrm share/doc/ja-gawk
-@dirrm share/awk
-@dirrm libexec/awk
diff --git a/japanese/gawk/distinfo b/japanese/gawk/distinfo
deleted file mode 100644
index 16647512904..00000000000
--- a/japanese/gawk/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 10:13:32 wiz Exp $
-
-SHA1 (gawk-3.0.4.tar.gz) = c22ab0ef08d80b6a4af821c8baffb9941b7f5e87
-Size (gawk-3.0.4.tar.gz) = 1027134 bytes
-SHA1 (gawkmb112.diff.gz) = 7498a14ab254195931adb7b085376997c168b864
-Size (gawkmb112.diff.gz) = 94799 bytes
-SHA1 (patch-aa) = da52f4b7afc6597750ebf8e77d395d41e57d74a7
-SHA1 (patch-ab) = bae2a88656dee140972e283770e1864c6d78b672
-SHA1 (patch-ac) = 852db39f17f620597464c8e78504016a3636b503
diff --git a/japanese/gawk/patches/patch-aa b/japanese/gawk/patches/patch-aa
deleted file mode 100644
index a64b8fd1fd7..00000000000
--- a/japanese/gawk/patches/patch-aa
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-aa,v 1.2 1999/10/11 13:00:43 sakamoto Exp $
-
---- Makefile.in.orig Mon Oct 11 21:30:42 1999
-+++ Makefile.in Mon Oct 11 21:35:44 1999
-@@ -48,5 +48,5 @@
- exec_suffix = @exec_suffix@
- prefix = @prefix@
--binprefix =
-+binprefix = j
- manprefix =
-
-@@ -195,12 +195,6 @@
-
- install: gawk$(exec_suffix) info installdirs
-- -rm -f $(bindir)/gawk$(exec_suffix)
-- fullname=gawk-$(REL).`./gawk '{print $$3}' $(srcdir)/patchlevel.h`+mb$(MBREL) ; \
-- $(INSTALL_PROGRAM) gawk$(exec_suffix) $(bindir)/$${fullname}$(exec_suffix) ; \
-- (cd $(bindir); $(LN) $${fullname}$(exec_suffix) gawk$(exec_suffix))
-- (cd $(bindir);\
-- if [ ! -f awk$(exec_suffix) ]; \
-- then $(LN_S) gawk$(exec_suffix) awk$(exec_suffix); \
-- fi; exit 0)
-+ $(INSTALL_PROGRAM) gawk$(exec_suffix) \
-+ $(bindir)/$(binprefix)gawk$(exec_suffix)
- cd doc && $(MAKE) install
- cd awklib && $(MAKE) install
-@@ -211,10 +205,5 @@
-
- uninstall:
-- (cd $(bindir); \
-- if [ -f awk$(exec_suffix) ] && cmp awk$(exec_suffix) gawk$(exec_suffix) > /dev/null; then rm -f awk$(exec_suffix); fi)
-- (fullname=gawk-$(REL).`gawk '{print $$3}' $(srcdir)/patchlevel.h`+mb$(MBREL) ; \
-- cd $(bindir); \
-- if cmp gawk$(exec_suffix) $${fullname}$(exec_suffix); then rm -f gawk$(exec_suffix); fi ; \
-- rm -f $(bindir)/$${fullname}$(exec_suffix))
-+ rm -f $(bindir)/$(binprefix)gawk$(exec_suffix))
- cd doc && $(MAKE) uninstall
- cd awklib && $(MAKE) uninstall
diff --git a/japanese/gawk/patches/patch-ab b/japanese/gawk/patches/patch-ab
deleted file mode 100644
index 00bd885d1e8..00000000000
--- a/japanese/gawk/patches/patch-ab
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ab,v 1.3 1999/10/11 13:00:43 sakamoto Exp $
-
---- awklib/Makefile.in.orig Mon Oct 11 21:30:42 1999
-+++ awklib/Makefile.in Mon Oct 11 21:36:58 1999
-@@ -35,5 +35,5 @@
- exec_prefix = @exec_prefix@
- exec_suffix = @exec_suffix@
--binprefix =
-+binprefix = j
- manprefix =
-
-@@ -76,5 +76,5 @@
-
- install: igawk $(AUXPROGS) $(AUXAWK)
-- $(INSTALL_PROGRAM) igawk $(bindir)/igawk
-+ $(INSTALL_PROGRAM:-s=) igawk $(bindir)/$(binprefix)igawk
- for i in $(AUXPROGS) ; do \
- $(INSTALL_PROGRAM) $$i $(libexecdir)/$$i ; \
-@@ -88,5 +88,5 @@
- uninstall:
- rm -fr $(libexecdir)/* $(datadir)/*
-- rm -f $(bindir)/igawk
-+ rm -f $(bindir)/$(binprefix)igawk
-
- clean:
diff --git a/japanese/gawk/patches/patch-ac b/japanese/gawk/patches/patch-ac
deleted file mode 100644
index a043e5a02a6..00000000000
--- a/japanese/gawk/patches/patch-ac
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ac,v 1.2 1999/10/11 13:00:43 sakamoto Exp $
-
---- doc/Makefile.in.orig Wed Apr 28 23:21:56 1999
-+++ doc/Makefile.in Mon Oct 11 21:38:08 1999
-@@ -31,5 +31,5 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- binprefix =
--manprefix =
-+manprefix = j
-
-@@ -83,16 +83,13 @@
- $(INSTALL_DATA) $$i $(infodir)/$$i ; \
- done; \
-- if $(SHELL) -c 'install-info --version' > /dev/null 2>&1 ; \
-- then install-info --info-dir=$(infodir) gawk.info ; \
-- else true ; fi; exit 0
-
- $(mandir)/gawk$(manext):: gawk.1
-- $(INSTALL_DATA) $(srcdir)/gawk.1 $(mandir)/gawk$(manext)
-+ $(INSTALL_DATA) $(srcdir)/gawk.1 $(mandir)/$(manprefix)gawk$(manext)
-
- $(mandir)/igawk$(manext):: igawk.1
-- $(INSTALL_DATA) $(srcdir)/igawk.1 $(mandir)/igawk$(manext)
-+ $(INSTALL_DATA) $(srcdir)/igawk.1 $(mandir)/$(manprefix)igawk$(manext)
-
- uninstall:
-- rm -f $(mandir)/gawk$(manext) $(mandir)/igawk$(manext) $(infodir)/gawk.info*
-+ rm -f $(mandir)/$(manprefix)gawk$(manext) $(mandir)/$(manprefix)igawk$(manext) $(infodir)/gawk.info*
-
- dvi: gawk.dvi
diff --git a/japanese/grep/DESCR b/japanese/grep/DESCR
deleted file mode 100644
index 00fcc85fc5b..00000000000
--- a/japanese/grep/DESCR
+++ /dev/null
@@ -1,9 +0,0 @@
-This package is multi-byte extented GNU GREP. It accepts text which
-includes multi-byte character code. Supported multi-byte codes are
-2 byte EUC code and/or Shift-JIS code.
-
-Grep searches the named input files (or standard input if no files are
-named, or the file name - is given) for lines containing a match to
-the given pattern. By default, grep prints the matching lines.
-
-Multi-byte patch by t^2(Takahiro Tanimoto, NBC02362@niftyserve.or.jp)
diff --git a/japanese/grep/Makefile b/japanese/grep/Makefile
deleted file mode 100644
index 8876849091d..00000000000
--- a/japanese/grep/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2001/02/25 04:17:53 hubertf Exp $
-# FreeBSD Id: Makefile,v 1.10 1999/01/27 07:41:16 fenner Exp $
-
-DISTNAME= grep-2.0
-PKGNAME= ja-grep-2.0
-CATEGORIES= japanese textproc
-MASTER_SITES= ${MASTER_SITE_GNU:=grep/}
-
-MAINTAINER= tech-pkg-ja@jp.netbsd.org
-HOMEPAGE= http://www.gnu.org/software/grep/grep.html
-COMMENT= GNU grep + multi-byte extension
-
-GNU_CONFIGURE= yes
-PATCH_STRIP= -p1
-
-post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ja-grep
- ${INSTALL_DATA} ${WRKSRC}/README.MB ${PREFIX}/share/doc/ja-grep
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/japanese/grep/PLIST b/japanese/grep/PLIST
deleted file mode 100644
index e87d8db68e2..00000000000
--- a/japanese/grep/PLIST
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:29:09 zuntum Exp $
-bin/jgrep
-bin/jegrep
-bin/jfgrep
-man/man1/jgrep.1
-share/doc/ja-grep/README.MB
-@dirrm share/doc/ja-grep
diff --git a/japanese/grep/distinfo b/japanese/grep/distinfo
deleted file mode 100644
index cd4ea7b561d..00000000000
--- a/japanese/grep/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 10:13:32 wiz Exp $
-
-SHA1 (grep-2.0.tar.gz) = 99e8f917557f1496cd3786e6c13f3900b8de24d8
-Size (grep-2.0.tar.gz) = 127065 bytes
-SHA1 (patch-aa) = 41d2bd451f1332b8dbc3f72e6c6a56308a2c081b
-SHA1 (patch-ab) = 4431f51bdfff5c5d710a80fe51b27886e9239956
-SHA1 (patch-ac) = e66d5d68f2e37139e1d706b1cfd51551b3075433
diff --git a/japanese/grep/patches/patch-aa b/japanese/grep/patches/patch-aa
deleted file mode 100644
index eeed1d0b742..00000000000
--- a/japanese/grep/patches/patch-aa
+++ /dev/null
@@ -1,2844 +0,0 @@
-$NetBSD: patch-aa,v 1.2 1999/06/08 09:27:27 sakamoto Exp $
-
-$B!|!|!|!|!|(B GNU grep version 2.0 + multi-byte extension 1.04 $B!|!|!|!|!|(B
-$B!|!|!|!|!|(B Jun. 2, 1994 by t^2 $B!|!|!|!|!|(B
-
- $B$3$N%U%!%$%k$O(B GNU grep version 2.0 (grep-2.0) $B$N%=!<%9%3!<%I$+$i(B, $B$=(B
- $B$N%^%k%A%P%$%HJ8;zBP1~HG(B grep-2.0+mb1.04 $B$N%=!<%9%3!<%I$r@8@.$9$k$?$a(B
- $B$N:9J,$r4^$s$G$$$^$9(B. grep-2.0 $B$N%=!<%9$rE83+$7$F$"$k%G%#%l%/%H%j$G(B
-
- % patch -p1 < $B$3$N%U%!%$%k(B
-
- $B$J$I$H$7$F%Q%C%A$rEv$F$F$/$@$5$$(B. $B$=$N8e(B README.MB $B$rFI$s$G$/$@$5$$(B.
-
-$B")(B810 $BJ!2,;TCf1{6hG_8w1`CDCO(B 7-207
-TEL/FAX: 092-731-4025 (TEL/FAX $B<+F0@ZBX$((B)
- 092-724-6342 (TEL $B$N$_(B)
-E-mail: NBC02362@niftyserve.or.jp t^2 ($BC+K\9'9@(B)
-
-diff -ru2N grep-2.0/ChangeLog.MB grep+mb1.04/ChangeLog.MB
---- grep-2.0/ChangeLog.MB Thu Jan 1 09:00:00 1970
-+++ grep+mb1.04/ChangeLog.MB Thu Jun 2 17:01:42 1994
-@@ -0,0 +1,219 @@
-+Thu Jun 2 16:58:03 1994 Takahiro Tanimoto (tt@isaac)
-+
-+ * Version 2.0 + multi-byte extension 1.04 released.
-+
-+Sat Mar 5 16:30:16 1994 Takahiro Tanimoto (tt@isaac)
-+
-+ * README.MSC: PC-9800 $B%7%j!<%:MQ(B MS-C 6.00A $B$N(B, $B%o%$%k%I%+!<%IE8(B
-+ $B3+%k!<%A%s$N%P%0$KBP=h$7$?(B. $B0JA0$N(B stdargv.diff $B$r$3$l$KE}9g$7(B,
-+ $B:o=|$7$?(B. (Thanks to $BJ!9@K.$5$s(B <GFE00522@niftyserve.or.jp>)
-+
-+Thu Aug 19 04:26:09 1993 Takahiro Tanimoto (tt@isaac)
-+
-+ * regex.c (re_compile_fastmap): charset_not $B$N(B fastmap $B$N:n@.=h(B
-+ $BM}$,4V0c$C$F$$$F(B, regex $B$N(B fastmap $B$r;HMQ$9$k>l9g(B (e?grep $B$G$O(B
-+ fastmap $B$r;HMQ$7$F$$$J$$$?$a(B, $B$3$NLdBj$OI=LL$K$O8=$l$J$$(B), $B@55,(B
-+ $BI=8=$N@hF,$N(B [^$B#A(B] $B$d(B [^a] $B$KNc$($P(B $B#B(B $B$,%^%C%A$7$J$+$C$?(B.
-+ (Thanks to $B>.20NIM4$5$s(B <JAE03716@niftyserve.or.jp>)
-+
-+Tue Aug 10 01:29:05 1993 Takahiro Tanimoto (tt@isaac)
-+
-+ * regex.c (set_list_bits): $BJ8;z%/%i%9Cf$N%^%k%A%P%$%HJ8;z$N:GE,(B
-+ $B2=$G(B, $B6h4V=*E@$N99?7=hM}ItJ,$K%P%0$,$"$j(B, [$B#A(B-$B#C#E(B-$B#G#B(B-$B#D(B] $B$r:G(B
-+ $BE,2=$9$k$H(B [$B#A(B-$B#G(B] $B$@$,(B, $B$3$l$,(B [$B#A(B-$B#E(B] $B$H$J$C$F$7$^$C$F$$$?(B.
-+ $B$?$@$7(B, regex $B$G$O$J$/(B dfa $B$,;HMQ$5$l$k>l9g$K$O$3$N%P%0$OI=LL$K(B
-+ $B$O8=$l$J$$(B.
-+
-+Fri Jul 23 03:22:13 1993 Takahiro Tanimoto (tt@isaac)
-+
-+ * Version 2.0 + multi-byte extension 1.03 released.
-+
-+ * DEFS.dos: strcmpi $B$r(B stricmp $B$KJQ99(B.
-+
-+ * grep.c (main): MS-DOS $B$N>l9g(B, argv[0] $B$r2C9)$7$?J8;zNs$X$N%]%$(B
-+ $B%s%?$r(B argv[0] $B$X$b%;%C%H$9$k(B. getopt $B$,=PNO$9$k%a%C%;!<%8$b2C(B
-+ $B9)$5$l$?J8;zNs$H$J$k(B.
-+
-+ * grep.c (main): MS-C 6.00A $B$N(B stdargv.asm $B$N%P%0$r%U%#%C%/%9$7(B
-+ $B$?$?$a(B, argv[0] == "" $B$N$H$-$N=hM}$r:o=|$7$?(B.
-+
-+ * stdargv.diff: $BDI2C(B.
-+
-+Tue Jul 13 07:04:13 1993 Takahiro Tanimoto (tt@isaac)
-+
-+ * Version 2.0 + multi-byte extension 1.02 released.
-+
-+Mon Jul 12 00:20:36 1993 Takahiro Tanimoto (tt@isaac)
-+
-+ * grep.c: HAVE_STRCASECMP $B$,(B #define $B$5$l$F$$$J$$$H$-(B, $B0lJ}$NJ8(B
-+ $B;zNs$@$1$r>.J8;z$K$7$F$+$iHf3S$9$k4X?t$rDj5A$7$F$$$?$,(B, $B;H$$J}$,(B
-+ $B0-$+$C$?(B. $B$=$l$r(B strcasecmp() $B$HF1$8$b$N$KJQ99$7$?(B.
-+
-+ * DEFS.dos: HAVE_STRCMPI $B$r(B #define $B$9$kBe$o$j$K(B,
-+ HAVE_STRCASECMP $B$r(B #define $B$7(B, strcasecmp $B$r(B strcmpi $B$K(B #define
-+ $B$7$?(B.
-+
-+Sat Jul 10 01:05:04 1993 Takahiro Tanimoto (tt@isaac)
-+
-+ * Version 2.0 + multi-byte extension 1.01 released.
-+
-+ * grep.c (main): MSDOS $B$N>l9g(B, argv[0] $B$r>.J8;z$K$7$F(B prog $B$K%;%C(B
-+ $B%H$9$k(B. $B$^$?(B, $B3HD%;R$O<h$j=|$/(B.
-+
-+ * obstack.h: chunk_size $B$N7?$r(B size_t $B$+$i(B unsigned $B$KJQ99(B.
-+ old-C $B$N>l9g(B, size_t $B$,Dj5A$5$l$F$$$J$$>uBV$H$J$C$?$?$a(B.
-+
-+ * regex.h: $BDj?t$N8e$K(B U, UL $B$r$D$1$k$H(B old-C $B$G%3%s%Q%$%k$G$-$J(B
-+ $B$$(B. $B$3$l$i$r%-%c%9%H$KJQ99$7$?(B.
-+
-+ * regex.h: RE_DUP_MAX $B$NDj5A$r(B 16 $B%S%C%H(B int $B$N%^%7%s$G$b%*!<%P(B
-+ $B%U%m!<$7$J$$=q$-J}$K=$@5(B.
-+
-+ * obstack.h: struct obstack $B$N%a%s%P(B chunk_size $B$N7?$r(B size_t $B$H(B
-+ $B$7$?(B. PTR_INT_TYPE $B$r30It$+$i(B #define $B$G$-$k$h$&$K$7$?(B. MSDOS
-+ $B$G(B SMALL MODEL $B0J30$N>l9g(B, __PTR_TO_INT, __INT_TO_PTR $B$H$H$b$K(B,
-+ $B%]%$%s%?$H(B long $B$rJQ49$9$k$h$&$K$7$?(B.
-+
-+ * grep.c (fillbuf, grep): read() $B$NJV$jCM$N@5Ii$K$h$k%(%i!<%A%'%C(B
-+ $B%/$r(B, -1 $B$KEy$7$$$+$I$&$+$G9T$&$h$&$KJQ99(B.
-+
-+ * grep.c: totalcc, totalnl $B$r(B unsigned long $B$KJQ99$7(B, prline()
-+ $BCf$N(B printf() $B$N=q<0$r9g$o$;$?(B.
-+
-+ * DEFS.dos: BUFSALLOC $B$r(B 4096 $B$K(B #define. (See reset() in
-+ grep.c.)
-+
-+ * getpagesize.h: MSDOS $B$N>l9g(B, $B%Z!<%8%5%$%:$O(B 4096 $B$H$7$?(B.
-+
-+ * dfa.c: STDC_HEADERS $B$^$?$O(B HAVE_STRING_H $B$N$H$-(B, bcopy, bzero
-+ $B$r%^%/%mE83+$9$k(B.
-+
-+Fri Jul 9 13:16:50 1993 Takahiro Tanimoto (tt@isaac)
-+
-+ * mbc.c, mbc.h, ...: ismbchar() $B$r%b%8%e!<%kKh$KFHN)$7$FDj5A$9$k(B
-+ $B$N$r$d$a(B, $B%b%8%e!<%k$rDI2C$7$?(B.
-+
-+ * search.c (Fexecute): fgrep $B$r%^%k%A%P%$%HJ8;z$KBP1~$5$;$?(B.
-+
-+Wed Jul 7 17:02:33 1993 Takahiro Tanimoto (tt@isaac)
-+
-+ * kwset.c (bmexec): 8 $B%S%C%H%/%j!<%s$G$J$$$H$3$m$r=$@5(B.
-+
-+ * $B%Y!<%9$r(B grep-2.0 $B$XJQ99(B.
-+
-+Sun Jul 4 08:48:12 1993 Takahiro Tanimoto (tt@isaac)
-+
-+ * regex.c (re_match_2): $B%*%j%8%J%k$N%P%0(B. maybe_finalize_jump
-+ $B$N=hM}Cf(B, start_memory/stop_memory $B$r%9%-%C%W$9$k$H$3$m$G(B, $B0z?t(B
-+ $B$N%9%-%C%W$r$7$F$$$J$$%P%0$r=$@5(B. $BNc$($P(B "([a-n]+).*\1" $B$,@5$7(B
-+ $B$/(B "abcxyzab" $B$K%^%C%A$9$k$h$&$K$J$C$?(B.
-+
-+Sat Jul 3 06:51:33 1993 Takahiro Tanimoto (tt@isaac)
-+
-+ * Version 1.6 + multi-byte extension 1.00 released.
-+
-+Sat Jul 3 04:29:14 1993 Takahiro Tanimoto (tt at pc98)
-+
-+ * grep.c (bufprev): -b $B%*%W%7%g%s$GI=<($9$k%P%$%H%*%U%;%C%H$r(B
-+ long $B$K$9$k$?$a$K(B bufprev $B$r(B long $B$H$7$?(B. bufprev $B0J30$OJQ99$7(B
-+ $B$F$$$J$$$?$a(B, 1 $B9T$N%5%$%:$,(B int $B$NHO0O$r1[$($k$H@5$7$/=hM}$5$l(B
-+ $B$J$$(B. $B$^$?(B, DOS $B$G$O(B CR+LF $B$r(B 1 $B%P%$%H$H$7$F%+%&%s%H$7$F$7$^$&(B.
-+ ($B<jH4$-(B)
-+
-+ * regex.c (re_match_2): $BJ8;z%/%i%9$N=hM}Cf$N(B 16 $B%S%C%H(B int $B$G@5(B
-+ $B>oF0:n$7$J$$ItJ,$r=$@5(B.
-+
-+ * regex.c (re_exec): re_search() $B$X$N:G8e$N0z?t$r(B 0 $B$+$i(B NULL $B$X(B
-+ $B=$@5(B.
-+
-+ * regex.c (re_match): re_match_2() $B$X$N#2HVL\$N0z?t$r(B 0 $B$+$i(B
-+ NULL $B$X=$@5(B.
-+
-+ * regex.c (re_search): re_search_2() $B$X$N#2HVL\$N0z?t$r(B 0 $B$+$i(B
-+ NULL $B$X=$@5(B.
-+
-+ * grep.c (main): MS-C $B$N(B setargv $B$N%P%0$N$;$$$G(B, grep "\\" foo
-+ $B$H$9$k$H(B argv[0] == "" $B$H$J$C$F$7$^$&(B. argv[0] == "" $B$N$H$-$O6/(B
-+ $B@)E*$K(B "grep" $B$^$?$O(B "egrep" $B$r%;%C%H$9$k$h$&$K$7$?(B.
-+
-+Fri Jul 2 19:25:58 1993 Takahiro Tanimoto (tt at pc98)
-+
-+ * grep.c (main): $BJQ?t(B prog $B$N@_Dj$r(B DOS $BMQ$K=$@5$7$?(B. $B$=$N:](B,
-+ $B%*%j%8%J%k$N$d$jJ}$O$^$:$+$C$?$N$G=$@5$7$?(B.
-+
-+ * grep.c: MSDOS $B$N$H$-(B errno $B$H(B sys_errlist $B$N@k8@$r$7$J$$$h$&$K(B
-+ $B=$@5$7$?(B.
-+
-+ * regex.c (set_list_bits): $B;HMQ$7$F$$$J$+$C$?JQ?t$r:o=|(B.
-+
-+ * Makefile.msc: DOS $B%5%]!<%H$N$?$aDI2C(B.
-+
-+Fri Jun 11 04:14:22 1993 Takahiro Tanimoto (tt@isaac)
-+
-+ * grep.c: version $BJ8;zNs$,8E$$$^$^$@$C$?(B.
-+
-+Tue May 25 00:10:49 1993 Takahiro Tanimoto (tt@isaac)
-+
-+ * Version 1.6 + multi-byte extension 0.02 released.
-+
-+Mon May 24 15:57:31 1993 Takahiro Tanimoto (tt@isaac)
-+
-+ * regex.c (re_search_2): $B8eJ}$X(B advance $B$9$k:]$N%P%0$r=$@5(B.
-+
-+Sat May 22 02:03:41 1993 Takahiro Tanimoto (tt@isaac)
-+
-+ * regex.c (re_compile_fastmap): exactn $B$G(B translate $B$9$k$N$r$d$a(B
-+ $B$?(B. re_compile_pattern $B$G0lEY(B translate $B$5$l$F$$$k$O$:(B.
-+
-+ * regex.c (re_match_2): exactn $B$N=hM}ItJ,$G(B, #if 0 $B$r(B #if 1 $B$K$7(B
-+ $B$?>l9g(B, $B@5$7$$=hM}$r9T$C$F$$$J$+$C$?$N$r=$@5(B.
-+
-+Fri May 21 20:04:07 1993 Takahiro Tanimoto (tt@isaac)
-+
-+ * regex.[ch]: mbcharset, mbcharset_not $B$rGQ;_(B. $BBe$o$j$K(B
-+ charset, charset_not $B$,%^%k%A%P%$%HJ8;z$r$bJ];}$9$k(B.
-+
-+ * grep.c (main): $B2<5-$NJQ99$KH<$C$F(B, "^.*(" ... ")" $B$rIU2C$9$k=h(B
-+ $BM}$r:o=|$7$?(B.
-+
-+ * dfa.c (regcompile): searchflag $B$,(B ON $B$N$H$-(B, $B@55,I=8=$r(B "^.*("
-+ ... ")" $B$H$7$F%3%s%Q%$%k$9$k$h$&$K$7$?(B. $B0JA0$O(B grep.c $B$NCf$GF1(B
-+ $B$8$3$H$r9T$C$F$$$?(B.
-+
-+ * dfa.c (lex): $BJ8;z%/%i%9$G%^%k%A%P%$%HJ8;z$N#1J8;zL\$N=89g$+$i(B,
-+ $B%7%s%0%k%P%$%HJ8;z$r=|30$9$k=hM}$rDI2C$7$?(B.
-+
-+ * dfa.c (lex): $BJ8;z%/%i%9$G%7%s%0%k%P%$%HJ8;z$N>e8B$,4V0c$C$F$$(B
-+ $B$?$N$r=$@5$7$?(B.
-+
-+Wed May 19 01:27:07 1993 Takahiro Tanimoto (tt@isaac)
-+
-+ * regex.c: !__STDC__ $B$N$H$-$K(B const $B$r(B #define.
-+
-+ * dfa.h: $B%*%j%8%J%k$G$O(B !STDC_HEADERS $B$N$H$-$K(B const $B$r(B #define
-+ $B$7$F$$$?$,(B, $B$3$l$r(B !__STDC__ $B$N$H$-$K(B #define $B$9$k$h$&$KJQ99$7$?(B.
-+
-+ * configure.in: bcopy(), memmove() $B$N%A%'%C%/$rDI2C(B.
-+
-+ * dfa.c (reginit): cs_tok[] $B$N=i4|2=$rDI2C$7$?(B. -i $B%U%i%0$rIU$1(B
-+ $B$?>l9g$NIT6q9g$r=$@5(B.
-+
-+Tue May 18 18:14:04 1993 Takahiro Tanimoto (tt@albert)
-+
-+ * dfa.h: regex.h $B$G$N(B RE_MBCTYPE_??? $B$NCM$H0lCW$5$;$?(B.
-+
-+ * regex.[ch] (RE_TRANSLATED_RANGE): mbsed-0.01 $B$G9T$C$?3HD%$rM"(B
-+ $BF~$7$?(B.
-+
-+Sat May 15 04:27:32 1993 Takahiro Tanimoto (tt@isaac)
-+
-+ * $B%^%k%A%P%$%HJ8;zBP1~HG$,0lDL$j40@.$7$?(B.
-+
-+
-+Local Variables:
-+mode: indented-text
-+left-margin: 8
-+fill-column: 72
-+fill-prefix: " "
-+version-control: never
-+End:
-diff -ru2N grep-2.0/DEFS.dos grep+mb1.04/DEFS.dos
---- grep-2.0/DEFS.dos Thu Jan 1 09:00:00 1970
-+++ grep+mb1.04/DEFS.dos Fri Jul 23 03:23:31 1993
-@@ -0,0 +1,15 @@
-+#define STDC_HEADERS 1
-+#define HAVE_STRING_H 1
-+#define HAVE_MEMCHR 1
-+#define HAVE_STRERROR 1
-+#define HAVE_MEMMOVE 1
-+#define HAVE_STRCASECMP 1
-+#define strcasecmp stricmp
-+
-+#define BUFSALLOC 4096
-+
-+#ifndef M_I86SM
-+#define __PTR_TO_INT(P) ((long)(P))
-+#define __INT_TO_PTR(P) ((char *)(P))
-+#define PTR_INT_TYPE long
-+#endif
-diff -ru2N grep-2.0/MANIFEST.MB grep+mb1.04/MANIFEST.MB
---- grep-2.0/MANIFEST.MB Thu Jan 1 09:00:00 1970
-+++ grep+mb1.04/MANIFEST.MB Sat Mar 5 16:37:46 1994
-@@ -0,0 +1,11 @@
-+ChangeLog.MB Revision history of multi-byte extension to grep.
-+DEFS.dos Definitions for DOS.
-+MANIFEST.MB This file.
-+Makefile.msc Makefile for MS-C version 6.
-+README.MB Documentation for multi-byte extension.
-+README.MSC Patch for source/startup/... of MS-C 6.00A
-+mbc.c Multi-byte char handler.
-+mbc.h Interface to mbc.c.
-+tests/batgen.awk DOS version of scriptgen.awk.
-+tests/check.bat DOS version of check.sh
-+tests/spencer.dos Input for batgen.
-diff -ru2N grep-2.0/Makefile.in grep+mb1.04/Makefile.in
---- grep-2.0/Makefile.in Mon May 3 05:54:24 1993
-+++ grep+mb1.04/Makefile.in Mon Jul 12 02:02:28 1993
-@@ -16,4 +16,7 @@
- # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-+# Multi-byte extension added May, 1993 by t^2 (Takahiro Tanimoto)
-+# Last change: Jul. 12, 1993 by t^2
-+
- SHELL = /bin/sh
-
-@@ -40,4 +43,11 @@
- DEFS=-DGREP @DEFS@
-
-+# Things you might set to MBCTYPE_DEF to spec. default multi-byte char type.
-+# -DEUC will make default multi-byte char type EUC and
-+# -DSJIS SJIS.
-+# If you do not set EUC/SJIS, grep assumes no multi-byte
-+# char as default.
-+MBCTYPE_DEF=-DEUC
-+
- # Extra libraries.
- LIBS=@LIBS@
-@@ -69,9 +79,9 @@
- #### End of system configuration section. ####
-
--SRCS=grep.c getopt.c regex.c dfa.c kwset.c obstack.c search.c
--OBJS=grep.o getopt.o regex.o dfa.o kwset.o obstack.o search.o
-+SRCS=grep.c getopt.c regex.c dfa.c kwset.c obstack.c search.c mbc.c
-+OBJS=grep.o getopt.o regex.o dfa.o kwset.o obstack.o search.o mbc.o
-
- .c.o:
-- $(CC) $(CFLAGS) $(DEFS) -I$(srcdir) -c $<
-+ $(CC) $(CFLAGS) $(DEFS) $(MBCTYPE_DEF) -I$(srcdir) -c $<
-
- all: grep check.done
-@@ -120,7 +130,9 @@
- dist:
- V=`sed -n '/version\\[/s/.*\\([0-9][0-9]*\\.[0-9]*\\).*/\\1/p' \
-+ grep.c`+mb`sed -n '/^ + multi-byte/s/[^0-9]*\\([0-9.]*\\).*/\\1/p' \
- grep.c`; \
- mkdir grep-$$V; mkdir grep-$$V/tests; \
-- for f in `awk '{print $$1}' MANIFEST`; do ln $$f grep-$$V/$$f; done; \
-+ for f in `awk '{print $$1}' MANIFEST MANIFEST.MB`; \
-+ do ln $$f grep-$$V/$$f; done; \
- tar cvhf - grep-$$V | gzip > grep-$$V.tar.z; \
- rm -fr grep-$$V
-@@ -132,2 +144,3 @@
- kwset.o obstack.o: obstack.h
- regex.o search.o: regex.h
-+grep.o regex.o dfa.o search.o mbc.o: mbc.h
-diff -ru2N grep-2.0/Makefile.msc grep+mb1.04/Makefile.msc
---- grep-2.0/Makefile.msc Thu Jan 1 09:00:00 1970
-+++ grep+mb1.04/Makefile.msc Fri Jul 23 04:03:17 1993
-@@ -0,0 +1,138 @@
-+# Generated automatically from Makefile.in by configure.
-+# Makefile for GNU grep
-+# Copyright (C) 1992 Free Software Foundation, Inc.
-+
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+# GNU General Public License for more details.
-+
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+
-+# Multi-byte extension added May, 1993 by t^2 (Takahiro Tanimoto)
-+# Last change: Jul. 23, 1993 by t^2
-+
-+#### Start of system configuration section. ####
-+
-+srcdir=.
-+VPATH=.
-+
-+AWK=gawk
-+INSTALL=cp
-+INSTALL_PROGRAM=$(INSTALL)
-+INSTALL_DATA=$(INSTALL)
-+
-+CC=cl -nologo -D__STDC__ -AL
-+LINT=lint
-+
-+# Things you might add to DEFS:
-+# -DSTDC_HEADERS If you have ANSI C headers and libraries.
-+# -DHAVE_UNISTD_H If you have unistd.h.
-+# -DUSG If you have System V/ANSI C string
-+# and memory functions and headers.
-+# -D__CHAR_UNSIGNED__ If type `char' is unsigned.
-+# gcc defines this automatically.
-+#
-+# For DOS, add those to DEFS.dos.
-+
-+# Things you might set to MBCTYPE_DEF to spec. default multi-byte char type.
-+# -DEUC will make default multi-byte char type EUC and
-+# -DSJIS SJIS.
-+# If you do not set EUC/SJIS, grep assumes no multi-byte
-+# char as default.
-+MBCTYPE_DEF=-DSJIS
-+
-+# Extra libraries.
-+LIBS=setargv/noe/st:30000
-+ALLOCA=
-+
-+CFLAGS=-Ox
-+LDFLAGS=$(CFLAGS)
-+
-+prefix=
-+exec_prefix=$(prefix)
-+
-+# Prefix for installed program, normally empty or `g'.
-+binprefix=
-+# Prefix for installed man page, normally empty or `g'.
-+manprefix=
-+
-+# Where to install executables.
-+bindir=$(exec_prefix)/bin
-+
-+# Where to install man pages.
-+mandir=$(prefix)/man/man1
-+
-+# Extension for man pages.
-+manext=1
-+
-+# How to make a hard link.
-+LN=cp
-+
-+#### End of system configuration section. ####
-+
-+SRCS=grep.c getopt.c regex.c dfa.c kwset.c obstack.c search.c mbc.c
-+OBJS=grep.obj getopt.obj regex.obj dfa.obj kwset.obj obstack.obj search.obj mbc.obj
-+
-+.c.obj:
-+ cat DEFS.dos $< > $*_.c
-+ $(CC) $(CFLAGS) $(MBCTYPE_DEF) -I$(srcdir) -c -Fo$@ $*_.c
-+ rm $*_.c
-+
-+all: grep.exe check.don
-+
-+# For Saber C.
-+grep.loa: $(SRCS)
-+ #load $(CFLAGS) $(DEFS) -I$(srcdir) (SRCS)
-+
-+# For Lint.
-+grep.lin: $(SRCS)
-+ $(LINT) $(CFLAGS) $(DEFS) -I$(srcdir) $(SRCS)
-+
-+install: all
-+ $(INSTALL_PROGRAM) grep.exe $(bindir)/$(binprefix)grep.exe
-+ rm -f $(bindir)/$(binprefix)egrep.exe
-+ $(LN) $(bindir)/$(binprefix)grep.exe $(bindir)/$(binprefix)egrep.exe
-+ rm -f $(bindir)/$(binprefix)fgrep.exe
-+ $(LN) $(bindir)/$(binprefix)grep.exe $(bindir)/$(binprefix)fgrep.exe
-+
-+check:
-+ tests\check
-+ echo done >check.don
-+
-+check.don: grep.exe
-+ tests\check
-+ echo done >check.don
-+
-+grep.exe: $(OBJS)
-+ echo $(OBJS:.obj =.obj+)+>link.tmp
-+ echo $(LIBS)>>link.tmp
-+ echo $@/noi;>>link.tmp
-+ link @link.tmp
-+ rm link.tmp
-+
-+clean:
-+ rm -f grep.exe *.obj check.don tmp.bat tmp.in khadafy.out
-+
-+mostlycl: clean
-+
-+distclea: clean
-+ rm -f Makefile config.sta
-+
-+realclea: distclea
-+ rm -f TAGS
-+
-+# Some header file dependencies that really ought to be automatically deduced.
-+dfa.obj search.obj: dfa.h
-+grep.obj search.obj: grep.h
-+kwset.obj search.obj: kwset.h
-+kwset.obj obstack.obj: obstack.h
-+regex.obj search.obj: regex.h
-+grep.obj regex.obj dfa.obj search.obj mbc.obj: mbc.h
-diff -ru2N grep-2.0/README.MB grep+mb1.04/README.MB
---- grep-2.0/README.MB Thu Jan 1 09:00:00 1970
-+++ grep+mb1.04/README.MB Thu Jun 2 17:03:37 1994
-@@ -0,0 +1,327 @@
-+$B!|!|!|!|!|(B GNU grep version 2.0 + multi-byte extension 1.04 $B!|!|!|!|!|(B
-+$B!|!|!|!|!|(B Jun. 2, 1994 by t^2 $B!|!|!|!|!|(B
-+
-+ grep-2.0+mb1.04 -- $B%^%k%A%P%$%HJ8;zBP1~HG(B GNU grep
-+
-+$B!|35MW(B
-+
-+ GNU $B%W%m%8%'%/%H$K$h$k(B grep, egrep, fgrep ($B0J2<C1$K(B grep) $B$r%^%k%A%P(B
-+ $B%$%HJ8;zBP1~2=$7$?$b$N$G$9(B.
-+
-+$B!|;HMQK!(B
-+
-+ grep $B$+$i$N3HD%ItJ,$@$1$r@bL@$7$^$9(B.
-+
-+ $BA}$($?%*%W%7%g%s$O0J2<$NDL$j$G$9(B.
-+
-+ -Wctype=ASCII
-+ $B%^%k%A%P%$%HJ8;z$r9MN8$7$^$;$s(B. $B$3$N%*%W%7%g%s$r;HMQ$7$?>l(B
-+ $B9g(B, grep $B$N%*%j%8%J%k$HF1$8F0:n$K$J$k$O$:$G$9(B.
-+
-+ -Wctype=EUC
-+ $B%^%k%A%P%$%HJ8;z$H$7$F(B EUC $B$rG'<1$7$^$9(B.
-+
-+ -Wctype=SJIS
-+ $B%^%k%A%P%$%HJ8;z$H$7$F(B Shift-JIS $B$rG'<1$7$^$9(B.
-+
-+ MS-DOS $B0J30$N%7%9%F%`$G(B, Makefile(.in)? $B$r=q$-49$($:$K%$%s%9%H!<(B
-+ $B%k$7$?>l9g(B, $B%G%U%)%k%H$G$O(B EUC $B$rG'<1$7$^$9(B. MS-DOS $B$G$O%G%U%)(B
-+ $B%k%H$G(B Shift-JIS $B$rG'<1$7$^$9(B.
-+
-+$B!|(B GREM104.LZH (MS-DOS $BHG<B9T7A<0$r4^$`%"!<%+%$%V(B) $B$K$D$$$F(B ($B$=$l0J30$N(B
-+ $B7ABV$GF~<j$5$l$?J}$OL5;k$7$F$/$@$5$$(B)
-+
-+ 1. $B%"!<%+%$%V$K4^$^$l$F$$$k%U%!%$%k(B
-+
-+ $B%*%j%8%J%k$+$iA4$/<j$r2C$($F$$$J$$%U%!%$%k(B
-+
-+ AUTHORS $B%*%j%8%J%k$N%=!<%9$K4^$^$l$F$$$k(B AUTHORS
-+ CHANGELO $B%*%j%8%J%k$N%=!<%9$K4^$^$l$F$$$k(B ChangeLog
-+ COPYING $B%*%j%8%J%k$N%=!<%9$K4^$^$l$F$$$k(B COPYING
-+ MANIFEST $B%*%j%8%J%k$N%=!<%9$K4^$^$l$F$$$k(B MANIFEST
-+ NEWS $B%*%j%8%J%k$N%=!<%9$K4^$^$l$F$$$k(B NEWS
-+ PROJECTS $B%*%j%8%J%k$N%=!<%9$K4^$^$l$F$$$k(B PROJECTS
-+ README $B%*%j%8%J%k$N%=!<%9$K4^$^$l$F$$$k(B README
-+
-+ grep+mb $BMQ$N%U%!%$%k(B
-+
-+ CHANGELO.MB grep+mb $B$NJQ99MzNr(B
-+ README.MB $B$3$N%U%!%$%k(B
-+
-+ MS-DOS $BHG(B grep+mb $BMQ$N%U%!%$%k(B
-+
-+ GREP.CAT $B%*%j%8%J%k$N%=!<%9$K4^$^$l$F$$$k%^%K%e%"%k%Z!<%8(B.
-+ grep.man $B$r(B GNU roff $B$G%U%)!<%^%C%H$7$?$b$N(B.
-+ GREP.EXE MS-DOS $BHG(B grep-2.0+mb1.04 $B$N<B9T7A<0(B
-+ READMAN.SED sed $B$r;}$C$F$$$k?M$X$*$^$1(B
-+ (sed -f readman.sed grep.cat)
-+
-+ 2. GREP.EXE $B$K$D$$$F(B
-+
-+ grep-2.0+mb1.04 $B$r(B MS-C 6.00A $B$G%3%s%Q%$%k$7$?$b$N$G$9(B.
-+
-+ $B%G%U%)%k%H$G(B Shift-JIS $B4A;z%3!<%I$r4^$`%Q%?!<%s$d%F%-%9%H$r=hM}(B
-+ $B$G$-$^$9(B.
-+
-+ setargv.obj $B$rAH$_9~$s$G$"$j$^$9$N$G(B, MS-DOS $B$G%]%T%e%i!<$J%?%$(B
-+ $B%W$N%o%$%k%I%+!<%I$,;HMQ$G$-$^$9(B. UNIX $B$N(B csh $B%i%$%/$J%o%$%k%I(B
-+ $B%+!<%IE83+%k!<%A%s$rMQ0U$7$h$&$+$H$b;W$C$?$N$G$9$,(B, MS-DOS $B$NB>(B
-+ $B$N%3%^%s%I$H$N@09g@-$,<h$l$J$$$7(B, $B%*%j%8%J%k$r$J$k$Y$/B:=E$7$?$+$C(B
-+ $B$?$N$GCGG0$7$^$7$?(B.
-+
-+ 3. $B%$%s%9%H!<%k(B
-+
-+ GREP.EXE $B$O(B, grep $B$O$b$A$m$s(B, egrep, fgrep $B$N5!G=$r4^$s$G$$$^$9(B.
-+ grep $B$K(B -E $B%*%W%7%g%s$rM?$($k$H(B egrep $B$NF0:n(B, -F $B%*%W%7%g%s$rM?(B
-+ $B$($k$H(B fgrep $B$NF0:n$r$7$^$9(B. $B$^$?(B, GREP.EXE $B$r(B EGREP.EXE,
-+ FGREP.EXE $B$H$$$&L>A0$G%3%T!<$7$F(B egrep, fgrep $B$H$7$F5/F0$9$k$H(B,
-+ $B$=$NL>A0$K$U$5$o$7$$F0:n$r$7$^$9(B. $B%O!<%I%G%#%9%/$KM>M5$N$J$$J}(B
-+ $B0J30$O(B,
-+
-+ A>copy grep.exe a:\bin
-+ A>copy grep.exe a:\bin\egrep.exe
-+ A>copy grep.exe a:\bin\fgrep.exe
-+
-+ $B$J$I$H$7$F$4;HMQ$K$J$i$l$k$3$H$r$*4+$a$7$^$9(B. $B$I$&$7$F$b%O!<%I(B
-+ $B%G%#%9%/$NL5BL;H$$$r$7$?$/$J$1$l$P(B,
-+
-+ @echo off
-+ grep -E %1 %2 %3 %4 %5 %6 %7 %8 %9
-+
-+ $B$J$I$N%P%C%A%U%!%$%k$r:n@.$9$k$H$$$&<j$b$"$j$^$9(B.
-+
-+ 4. $B%3%^%s%I%i%$%s0z?t$K$D$$$F(B
-+
-+ $BA0=R$7$?$H$*$j(B MS-C $B$N(B setargv.obj $B$r%j%s%/$7$F$$$^$9$N$G(B, $B$=$N(B
-+ $B;EMM$K=>$o$J$1$l$P$J$j$^$;$s(B.
-+
-+ $B#1$D#1$D$N0z?t$O6uGr$G6h@Z$j$^$9(B. $B0z?t$K6uGr(B, ", \, <, >, | $B$r(B
-+ $B4^$`$H$-$O%/%)!<%F%#%s%0$,I,MW$G$9(B. $B$=$NJ}K!$O(B COMMAND.COM $B$N%P(B
-+ $B%0=-$$;EMM$H(B, $B$5$i$K(B setargv.obj $B$K$bLdBj$,$"$j(B, $B$+$J$jFq$7$$$N(B
-+ $B$G$3$3$G$O@bL@$r>J$-$^$9(B. $B3F<+8&5f$7$F$/$@$5$$(B. $B0lHV4JC1$J$N$O(B,
-+ $B8!:w%Q%?!<%s$r%U%!%$%k$K$7$F(B
-+
-+ grep -f $B%U%!%$%kL>(B
-+
-+ $B$H$9$k$3$H$G$9(B.
-+
-+ 5. $B%^%K%e%"%k(B
-+
-+ roff $B7O$N%U%)!<%^%C%?$r;H$($J$$?M$N$?$a$K(B GNU roff $B$G%U%)!<%^%C(B
-+ $B%H:Q$_$N%^%K%e%"%k$rMQ0U$7$^$7$?(B. $B%\!<%k%I%U%'!<%9(B, $B%"%s%@!<%i(B
-+ $B%$%sBP1~$N(B less $B$J$I$G$*FI$_$/$@$5$$(B. $B%(%G%#%?$J$I$G$O(B ^H $B$,F~$C(B
-+ $B$F$$$FFI$_$K$/$$$H;W$$$^$9(B.
-+
-+ s/.^H//g
-+
-+ $B$H$$$&(B sed $B$N%W%m%0%i%`$KDL$;$P(B, $BDL>o$N%F%-%9%H%U%!%$%k$,F@$i$l(B
-+ $B$^$9(B. (^H $B$H$$$&$N$O%3%s%H%m!<%k%3!<%I$rD>@\Kd$a$3$`$H$$$&0UL#(B
-+ $B$G$9(B.)
-+
-+$B!|%$%s%9%H!<%k(B (MS-DOS $B0J30(B)
-+
-+ $B%G%U%)%k%H$N%^%k%A%P%$%HJ8;z$N@_Dj$O(B, Makefile.in $B$NCf$G;XDj$7$^$9(B.
-+ $B%G%U%)%k%H$r(B Shift-JIS $B$H$9$k>l9g$H(B, $B%G%U%)%k%H$G%^%k%A%P%$%HJ8;z$r(B
-+ $B;HMQ$7$J$$>l9g$O(B Makefile.in $B$N(B MBCTYPE_DEF $B%^%/%m$NDj5A$r$=$l$>$l0J(B
-+ $B2<$N$h$&$KJQ$($F$/$@$5$$(B.
-+
-+ MBCTYPE_DEF=-DSJIS ($B%G%U%)%k%H$G(B Shift-JIS $B$N>l9g(B)
-+ MBCTYPE_DEF= ($B%G%U%)%k%H$G;HMQ$7$J$$>l9g(B)
-+
-+ $B$$$:$l$N>l9g$G$b5/F0;~$N%*%W%7%g%s$K$h$j%^%k%A%P%$%HJ8;z%3!<%I$NA*Br(B
-+ $B$,2DG=$G$9(B.
-+
-+ $B$=$NB>$N:n6H$O(B, $B%*%j%8%J%k$N(B grep $B$HF1MM$G$9$N$G(B INSTALL $B$r$*FI$_$/(B
-+ $B$@$5$$(B.
-+
-+$B!|%$%s%9%H!<%k(B (MS-DOS $BHG(B. $B$3$3$G$$$&%$%s%9%H!<%k$H$$$&$N$O(B, $B%=!<%9$+$i(B
-+ $B$N%$%s%9%H!<%k$N$3$H$G$9(B)
-+
-+ MS-C 6.00A $B$r;HMQ$7$F(B, $B%G%U%)%k%H$G(B Shift-JIS $B$rG'<1$9$k(B grep $B$r:n@.(B
-+ $B$9$k>l9g$O(B, README.MSC $B$KL\$rDL$7$F(B, $BI,MW$J$i%i%$%V%i%j$K%Q%C%A$rEv(B
-+ $B$F$?8e(B,
-+
-+ A>nmake -f makefile.msc
-+
-+ $B$H$9$k$@$1$G#O#K$G$9(B. grep.exe $B$r:n@.8e(B, $B<+F0E*$K%F%9%H$r9T$$$^$9(B.
-+ $B$=$N:](B, grep $B$+$i$N%(%i!<%a%C%;!<%8$,$$$/$D$+I=<($5$l$^$9$,(B, $B$=$l$O(B
-+ $B0[>o$G$O$"$j$^$;$s(B. $B%(%i!<$r4^$`%Q%?!<%s$rEO$7$?;~$K(B, $B=*N;%9%F!<%?(B
-+ $B%9$,(B 2 $B$H$J$k$3$H$r3NG'$7$F$$$k$@$1$G$9(B. $BK\Ev$K0[>o$,$"$C$?>l9g$O(B
-+ "Spencer test #nn faild" (nn $B$O?t;z(B) $B$HI=<($5$l$^$9(B.
-+
-+ $B%F%9%H$K%Q%9$7$?$i(B, grep.exe $B$rE,Ev$J%G%#%l%/%H%j$K%3%T!<$7$F$/$@$5(B
-+ $B$$(B. $B$=$N:](B, $BL>A0$r(B egrep.exe, fgrep.exe $B$HJQ$($k$@$1$G(B, $B$=$l$>$l(B
-+ egrep, fgrep $B$NF0:n$r$7$^$9(B. $B$=$3$G(B, $BNc$($P(B a:\bin $B$X%$%s%9%H!<%k$9(B
-+ $B$k>l9g(B,
-+
-+ A>copy grep.exe a:\bin
-+ A>copy grep.exe a:\bin\egrep.exe
-+ A>copy grep.exe a:\bin\fgrep.exe
-+
-+ $B$J$I$H$7$^$9(B.
-+
-+ $B$=$NB>$N=hM}7O$r;HMQ$9$k>l9g$d(B, $B%G%U%)%k%H$r(B Shift-JIS $B0J30$K$9$k>l(B
-+ $B9g$O(B Makefile.msc $B$r;29M$K(B Makefile $B$r=q$$$F$/$@$5$$(B. $B$J$*(B, $B%F%9%H$K(B
-+ $B$O(B awk (gawk) $B$,I,MW$G$9(B.
-+
-+$B!|%P%0(B
-+
-+ 1. $B$$$o$f$k(B JIS $B$K$OBP1~$7$F$$$^$;$s(B. $B>-MhBP1~$9$kM=Dj$b$"$j$^$;$s(B.
-+
-+ 2. $B%^%k%A%P%$%HJ8;z%3!<%I$O$"$^$j873J$K$O9M$($F$$$^$;$s(B.
-+
-+ EUC $B#1%P%$%HL\(B ... 0x80 - 0xff
-+ EUC $B#2%P%$%HL\(B ... 0x01 - 0xff (0x0a $B$r=|$/(B)
-+
-+ Shift-JIS $B#1%P%$%HL\(B ... 0x80 - 0x9f, 0xe0 - 0xff
-+ Shift-JIS $B#2%P%$%HL\(B ... 0x01 - 0xff (0x0a $B$r=|$/(B)
-+
-+ $B$H$7$F=hM}$7$F$$$^$9(B. $BH>3Q%+%J$b;H$($^$9(B. EUC $B$N(B SS3 (0x8f) $B$K(B
-+ $B;O$^$k#3%P%$%H%3!<%I$O;H$($^$;$s(B. ($B;d$O$3$l$r%5%]!<%H$7$F$$$k%7(B
-+ $B%9%F%`$r8+$?$3$H$,$J$$(B...)
-+
-+ 3. -b $B%*%W%7%g%s$GI=<($5$l$k%P%$%H%*%U%;%C%H$O(B DOS $B$N>l9g(B CR+LF $B$r(B 1
-+ $B$H$7$F%+%&%s%H$7$?CM$K$J$j$^$9(B. ($B<jH4$-(B)
-+
-+$B!|%"%k%4%j%:%`(B (dfa.[ch] $B$N%^%k%A%P%$%HJ8;zBP1~2=(B)
-+
-+ $B0JA0$OGyA3$H(B, DFA $B$rD>@\(B EUC $B$d(B Shift-JIS $B$N$h$&$JJ8;z<o$NB?$$%3!<%I(B
-+ $B%;%C%H$KBP1~$5$;$k$N$O(B, $BHs>o$KFq$7$$$H;W$C$F$$$^$7$?(B. $B$H$3$m$,$"$k(B
-+ $BF|(B, $B<+:n%i%$%V%i%j$N%F%9%HMQ$K(B, $B@55,I=8=$r(B DFA $B$XJQ49$9$k4JC1$J%W%m(B
-+ $B%0%i%`$r=q$$$?$H$-$K(B, $BFMA3$&$^$$%"%$%G%#%"$,A.$$$?$N$G$9(B. $B%^%k%A%P(B
-+ $B%$%HJ8;z$H$$$($I$b7k6I$O%P%$%H$NJB$S$G$9(B. $B%^%k%A%P%$%HJ8;z$r(B, $B$9$Y(B
-+ $B$F%P%$%HC10L$KJ,2r$7$F(B, $B@55,I=8=$r:n$C$F$7$^$($P$h$+$C$?$N$G$9(B.
-+
-+ $B8@MU$G$O$&$^$/I=8=$G$-$J$$$N$G(B, $B0J2<$N5-9f$r;HMQ$7(B, $B$I$&$$$&$U$&$K%P(B
-+ $B%$%HC10L$KJ,2r$7$F$$$k$N$+(B, $BNc$r5s$2$^$9(B.
-+
-+ a, b, c ... $B%7%s%0%k%P%$%HJ8;z(B.
-+ x, y, z ... $B%^%k%A%P%$%HJ8;z$N#1J8;zL\(B.
-+
-+ . ($BG$0U$N#1J8;z(B)
-+ ==> [a-c]|[x-z][a-z]
-+
-+ ($B%7%s%0%k%P%$%HJ8;z$+(B, $B$^$?$O%^%k%A%P%$%HJ8;z$N#1J8;zL\$H(B
-+ $BG$0U$N#1J8;z$NO"@\(B.)
-+
-+ [xb-zx] (xb $B$+$i(B zx $B$NHO0O$N%^%k%A%P%$%HJ8;z(B)
-+ ==> x[b-z]|y[a-z]|z[a-x]
-+
-+ yb*
-+ ==> (yb)*
-+
-+ $B<B:]$K$O@55,I=8=$r:n$j=P$9$N$G$O$J$/(B, $B@55,I=8=$rJ,2r$7$?%H!<%/%s$rD>(B
-+ $B@\@8@.$7$F$$$^$9(B. $B$3$NJU(B, $B6=L#$,$"$kJ}$O%=!<%9$r8+$?$[$&$,Aa$$$H;W(B
-+ $B$$$^$9(B. ($B$"$^$j%(%l%,%s%H$G$O$"$j$^$;$s$N$G%=!<%9$r$8$C$/$j8+$i$l$k(B
-+ $B$N$OCQ$:$+$7$$5$$b$7$^$9$,(B...)
-+
-+ $B$3$l$@$1$G$O(B, $BNc$($P$"$k%F%-%9%H$+$i(B xy $B$H$$$&J8;z$rC5$=$&$H$9$k$H(B,
-+ xxyy $B$N$h$&$JJ8;z$NJB$S$K$^$GH?1~$7$F$7$^$$$^$9(B. $B$=$3$G(B, $B%^%k%A%P%$(B
-+ $B%H%b!<%I$N$H$-$K$OI,$:(B "^.*(" + $B%f!<%6%Q%?!<%s(B + ")" $B$H$7$F=hM}$7$^(B
-+ $B$9(B. '.*' $B$K$h$j(B, '.' $B$O%^%k%A%P%$%HJ8;z$N0lIt$K$O%^%C%A$7$^$;$s$+$i(B,
-+ $BF,=P$7$G$-$k$o$1$G$9(B.
-+
-+$B!|(B dfa.[ch], regex.[ch] $B$N3HD%;EMM(B
-+
-+ dfa.[ch], regex.[ch] $B%b%8%e!<%k$O(B mbc.[ch] $B%b%8%e!<%k$K0MB8$7$F$$$^(B
-+ $B$9(B. $B$^$?(B, $B$3$l$O%*%j%8%J%k$N;EMM$G$9$,(B, dfa.[ch] $B$r;HMQ$9$k>l9g$O(B
-+ regex.h $B$NDj5A$,I,MW$G$9(B.
-+
-+ $B%^%k%A%P%$%HJ8;z$N%?%$%W$O(B, mbc.[ch] $B$N(B mbcinit() $B$G@_Dj$7$^$9(B.
-+ mbc.h $B$KDj5A$5$l$F$$$k%^%/%m(B MBCTYPE_ASCII, MBCTYPE_EUC,
-+ MBCTYPE_SJIS $B$N$$$:$l$+$r(B mbcinit() $B$KEO$7$F$/$@$5$$(B.
-+
-+ dfa.[ch] $B$O(B, $B%Q%?!<%s$N%3%s%Q%$%k;~$K$@$1(B, $B$3$N(B mbc.[ch] $B$N@_Dj$r;2(B
-+ $B>H$7$^$9(B. $B%Q%?!<%s%^%C%A%s%0$N:]$O(B, $B%3%s%Q%$%k;~$K@_Dj$5$l$F$$$?(B,
-+ $B%^%k%A%P%$%HJ8;z$N%?%$%W$r8!:w$7$^$9(B.
-+
-+ $B0lJ}(B, regex.[ch] $B$O(B, $B%Q%?!<%s%3%s%Q%$%k;~(B, $B%^%C%A%s%0;~$NN>J}$G(B
-+ mbc.[ch] $B$N@_Dj$r;2>H$7$^$9(B. $B$,(B, $B$3$NN><T$G(B mbc.[ch] $B$N@_Dj$rJQ99$9(B
-+ $B$k$3$H$O$G$-$^$;$s(B. $B$D$^$j(B, Shift-JIS $B$G5-=R$5$l$?%Q%?!<%s$r(B, EUC
-+ $B%F%-%9%H$+$i8!:w$9$k$H$$$C$?F0:n$O$G$-$^$;$s(B. $BCm0U$7$F$/$@$5$$(B.
-+
-+ $B%^%k%A%P%$%HJ8;zBP1~$KH<$C$FCm0U$9$Y$-@55,I=8=$r0J2<$K5-$7$^$9(B.
-+
-+ . $BG$0U$N#1%P%$%HJ8;z(B, $B@5Ev$J%^%k%A%P%$%HJ8;z$K%^%C%A$7$^$9(B.
-+ $B!V@5Ev$J%^%k%A%P%$%HJ8;z!W$H$O(B, $B%^%k%A%P%$%HJ8;z$N#1J8;z(B
-+ $BL\$K(B, '\0' $B$^$?$O(B '\n' $B0J30$,B3$/J8;z$N$3$H$G$9(B.
-+
-+ [x-y] $BJ8;z%3!<%I(B ($BFbItI=8=(B) $B$,(B x $B$+$i(B y $B$NHO0O$K$"$kG$0U$N#1J8(B
-+ $B;z$K%^%C%A$7$^$9(B. $B$3$l$b(B . $B$HF1$8$/(B, $B@5Ev$G$J$$J8;z$K$O(B
-+ $B%^%C%A$7$^$;$s(B.
-+
-+ [^x-y] $BJ8;z%3!<%I(B ($BFbItI=8=(B) $B$,(B x $B$+$i(B y $B$NHO0O$K$J$$G$0U$N#1J8(B
-+ $B;z$K%^%C%A$7$^$9(B. $B@5Ev$G$J$$J8;z$K$b%^%C%A$7$^$9(B.
-+
-+ $B%^%k%A%P%$%HJ8;z$NFbItI=8=$OC1$K#1%P%$%HL\$r>e0L%P%$%H(B, $B#2%P%$%HL\$r(B
-+ $B2<0L%P%$%H$H$7$?#1#6%S%C%HId9f$J$7@0?t$G$9(B. Shift-JIS $B$G$b(B EUC $B$G$b(B
-+
-+ $B#1%P%$%H(B ASCII $BJ8;z(B < $BH>3Q%+%JJ8;z(B < $BA43QJ8;z(B
-+
-+ $B$H$$$&Bg>.4X78$,@.$jN)$C$F$$$^$9(B.
-+
-+$B!|$=$NB>(B
-+
-+ 1. $B%*%j%8%J%k$N(B GNU grep $B$NCx:n8"$O(B Free Software Foundation, Inc.
-+ $B$,M-$7$F$$$^$9(B. $B%Q%C%AItJ,(B (grep-mb.diff) $B$NCx:n8"$O;d(B (t^2) $B$,M-(B
-+ $B$7$F$$$^$9(B.
-+
-+ 2. GNU grep $B$N%=!<%9%3!<%I$O3F=j$N(B ftp $B%5%$%H(B, $B$b$7$/$O(B Nifty-serve
-+ $B$N(B FUNIX $B$N%G!<%?%i%$%V%i%j$+$iF~<j2DG=$G$9(B. GNU grep $B$+$i(B
-+ grep+mb $B$X$N:9J,(B grep-mb.diff $B$O(B, $B;d$,(B FUNIX $B$XEPO?$7(B, $BF21`OBO:;a(B
-+ (dohzono@sdsft.kme.mei.co.jp) $B$,(B fj.sources $B$X%]%9%H$7$F$/$@$5$C(B
-+ $B$F$$$^$9(B.
-+
-+ 3. $B:9J,(B grep-mb.diff $B$N:FG[I[$O<+M3$G$9(B. $B$3$l$K4X$7$F$O(B FSF $B$N5,Dj$K(B
-+ $B=>$&I,MW$b$"$j$^$;$s(B. $B$7$+$7:9J,$rE,MQ$7$?7k2L$N%=!<%9%3!<%I(B, $B$*(B
-+ $B$h$S<B9T7A<0$G$N:FG[I[$N:]$O(B GNU GENERAL PUBLIC LICENSE (COPYING
-+ $B;2>H(B) $B$K=>$C$F$/$@$5$$(B.
-+
-+ grep+mb $B$K2?$i$+$N2~JQ$r2C$($?$b$N$r:FG[I[$9$k:]$b(B, GNU GENERAL
-+ PUBLIC LICENSE $B$K=>$&$h$&$KCm0U$7$F$/$@$5$$(B. $B$^$?(B grep+mb $B$K4^$^(B
-+ $B$l$k%3!<%I(B (dfa.[ch] $B$d(B regex.[ch]) $B$rMxMQ$7$?%W%m%0%i%`$rG[I[$9(B
-+ $B$k:]$b(B GNU GENERAL PUBLIC LICENSE $B$N3:EvItJ,$K=>$C$F$/$@$5$$(B.
-+
-+ $B$^$?5AL3$G$O$"$j$^$;$s$,:FG[I[$5$l$kJ}$O;v8e$K$G$bO"Mm$r$/$@$5$$(B.
-+ $B$=$7$F2DG=$J8B$j(B, $B?7$7$$%P!<%8%g%s$X$N%"%C%W%G!<%H$KEX$a(B, $BMxMQ<T(B
-+ $B$+$i$NO"Mm$,;d$KFO$/$h$&$KG[N8$7$F$/$@$5$$(B.
-+
-+ 4. $B$3$N%W%m%0%i%`$OL5J]>Z$G$9(B.
-+
-+ 5. grep+mb $B$K2?$i$+$NIT6q9g$,H/@8$7$?>l9g(B, (FSF $B$d(B, $B%*%j%8%J%k$N:n<T(B
-+ $B$G$O$J$/(B) $B;d$KO"Mm$7$F$/$@$5$$(B. $BG[I[$7$??M$,4uK>$7$F$$$k>l9g$O(B,
-+ $B$=$N?M$KO"Mm$7$F$/$@$5$$(B.
-+
-+ 6. $B$4<ALd(B/$B$4MWK>(B/$B$*<8$j(B, $B$=$NB>$bBg4?7^$G$9(B. $B$G$-$k$+$.$j%5%]!<%H$7(B
-+ $B$^$9(B.
-+
-+$B!|<U<-(B
-+
-+ $B86:n<T$*$h$S(B FSF $B$K46<U$7$^$9(B.
-+
-+ $B%I%-%e%a%s%H:n@.$K4X$7$F=u8@$r$/$@$5$C$?F21`OBO:;a(B
-+ (dohzono@sdsft.kme.mei.co.jp) $B$K46<U$7$^$9(B.
-+
-+ $B$3$l$^$GE>:\(B/$B%P%0Js9p$r$/$@$5$C$?J}!9$K46<U$7$^$9(B. $B<BL>$r5s$2$5$;$F(B
-+ $BD:$-$?$+$C$?$N$G$9$,%O!<%I%G%#%9%/$N%H%i%V%k$G$[$H$s$I$N%a!<%k$r>C<:(B
-+ $B$5$;$F$7$^$$$^$7$?(B.
-+
-+ $B:G8e$K(B, $B5.=E$J%G%#%9%/%9%Z!<%9$r(B grep+mb $B$N$?$a$K3d$$$F$4;HMQD:$$$F(B
-+ $B$$$k$9$Y$F$NMxMQ<T$NJ}!9$K46<U$7$^$9(B.
-+
-+$B!|!V;d!W$NO"Mm@h(B
-+
-+ $B")(B810 $BJ!2,;TCf1{6hG_8w1`CDCO(B 7-207 ($BCm(B: $BE>5o$7$^$7$?(B)
-+ TEL/FAX: 092-731-4025 (TEL/FAX $B<+F0@ZBX$((B)
-+ 092-724-6342 (TEL $B$N$_(B)
-+ E-mail: NBC02362@niftyserve.or.jp $BC+K\9'9@(B
-+
-+# Local variables:
-+# mode: indented-text
-+# indent-tabs-mode: nil
-+# tab-stop-list: (4 8 16 24 32 40 48 56 64 72 80)
-+# left-margin: 4
-+# fill-column: 72
-+# fill-prefix: " "
-+# version-control: never
-+# End:
-diff -ru2N grep-2.0/README.MSC grep+mb1.04/README.MSC
---- grep-2.0/README.MSC Thu Jan 1 09:00:00 1970
-+++ grep+mb1.04/README.MSC Sat Mar 5 16:14:14 1994
-@@ -0,0 +1,99 @@
-+PC-9801 $BMQ(B MS-C version 6.00A $B$N0z?t$N%;%C%H%"%C%W%k!<%A%s$K$O%P%0$,$"$j(B
-+$B$^$9(B.
-+
-+#include <stdio.h>
-+
-+int
-+main(int argc, char **argv)
-+{
-+ int i;
-+
-+ for (i = 0; i <= argc; i++)
-+ printf("argv[%d] == %s\n", i, argv[i]);
-+ return 0;
-+}
-+
-+$B$r%3%s%Q%$%k(B, $B%j%s%/$7$?(B FOO.EXE $B$K(B
-+
-+ A>foo "\\" abc
-+
-+$B$J$I$N0z?t$rEO$7$F<B9T$9$k$H(B, $B%P%0$,3NG'$G$-$^$9(B. $B$^$?(B, $B%o%$%k%I%+!<%I(B
-+$BE83+%k!<%A%s$K$b%P%0$,$"$j(B, $B>e5-$N%W%m%0%i%`$r(B SETARGV.OBJ $B$H$H$b$K%j%s(B
-+$B%/$7$F(B
-+
-+ A>foo \DOS\*.com
-+
-+$B$J$I$N0z?t$G<B9T$9$k$H(B, $B$*$+$7$JE83+$N;EJ}$r$7$F$7$^$$$^$9(B.
-+
-+$B$3$N%P%0$O(B SOURCE/STARTUP $B2<$N(B DOS/STDARGV.ASM $B$*$h$S(B WILD.C $B$K0J2<$N%Q%C(B
-+$B%A$rEv$F$k$H=$@5$G$-$k$h$&$G$9(B. $B%Q%C%A$rEv$F$F(B STARTUP.BAT $B$G%3%s%Q%$%k(B
-+$B$7$F$/$@$5$$(B. $B$=$N8e(B, $BNc$($P%i!<%8%b%G%kMQ$N%i%$%V%i%j$r=$@5$9$k>l9g(B,
-+L/DOS/STDARGV.OBJ, L/DOS/_SETARGV.OBJ, L/WILD.OBJ $B$r$=$l$>$l(B
-+KSTDARGV.OBJ, _KSTARGV.OBJ, KWILD.OBJ $B$H%j%M!<%`$7(B,
-+
-+ lib \msc6\lib\llibce.lib-+dos\kstdargv.obj-+dos\_kstargv.obj-+kwild.obj;
-+
-+$B$J$I$H$7$F%b%8%e!<%k$r99?7$7$F$/$@$5$$(B. $BG0$N$?$a$3$N:n6H$r9T$&A0$K(B,
-+
-+ lib \msc6\lib\llibce.lib*kstdargv.obj*_kstargv.obj*kwild.obj;
-+
-+$B$J$I$G(B, kstdargv.obj, _kstargv.obj, kwild.obj $B$N%P%C%/%"%C%W$r$H$C$FCV$/(B
-+$B$H$$$$$G$7$g$&(B.
-+
-+$B$J$*(B, $B$3$N%Q%C%A$OEvA3$N$3$H$J$,$iL5J]>Z$G$9(B.
-+
-+Mar. 5, 1994 t^2
-+
-+*** stdargv.org Mon Oct 8 19:50:46 1990
-+--- stdargv.asm Thu Jul 22 17:50:44 1993
-+***************
-+*** 409,415 ****
-+ shr cx,1
-+ adc dx,cx ; add 1 for every pair of backslashes
-+ test al,1 ; plus 1 for the " if odd number of \
-+! jz arg310 ; [J1]
-+ jmp arg210 ; [J1]
-+ ;
-+ ; Command line is fully parsed - compute number of bytes needed
-+--- 409,415 ----
-+ shr cx,1
-+ adc dx,cx ; add 1 for every pair of backslashes
-+ test al,1 ; plus 1 for the " if odd number of \
-+! jnz arg310 ; ! Jul.21.93 t^2
-+ jmp arg210 ; [J1]
-+ ;
-+ ; Command line is fully parsed - compute number of bytes needed
-+
-+*** wild.org Mon Oct 8 19:49:48 1990
-+--- wild.c Sat Mar 5 00:42:12 1994
-+***************
-+*** 186,197 ****
-+ char *ptr2 = arg; // [J1]
-+
-+ if(ptr != arg) { // [J1]
-+! while(ptr2 + 1 != ptr && *ptr2 != SLASHCHAR && *ptr2 != FWDSLASHCHAR
-+! && *ptr2 != ':') { // [J1]
-+ if(iskanji(*ptr2)) ptr2++; // [J1]
-+ ptr2++; // [J1]
-+ } // [J1]
-+! ptr = ptr2; // [J1]
-+ } // [J1]
-+
-+ if (*ptr == ':' && ptr != arg+1) /* weird name, just add it as is */
-+--- 186,201 ----
-+ char *ptr2 = arg; // [J1]
-+
-+ if(ptr != arg) { // [J1]
-+! char *ptr3 = arg;
-+!
-+! while (ptr2 < ptr) {
-+! if (*ptr2 == SLASHCHAR || *ptr2 == FWDSLASHCHAR
-+! || *ptr2 == ':')
-+! ptr3 = ptr2;
-+ if(iskanji(*ptr2)) ptr2++; // [J1]
-+ ptr2++; // [J1]
-+ } // [J1]
-+! ptr = ptr3;
-+ } // [J1]
-+
-+ if (*ptr == ':' && ptr != arg+1) /* weird name, just add it as is */
-diff -ru2N grep-2.0/configure grep+mb1.04/configure
---- grep-2.0/configure Sat May 22 13:20:23 1993
-+++ grep+mb1.04/configure Fri Jul 9 13:05:45 1993
-@@ -566,5 +566,5 @@
- fi
-
--for func in getpagesize memchr strerror valloc
-+for func in getpagesize memchr strerror valloc bcopy memmove strcasecmp
- do
- trfunc=HAVE_`echo $func | tr '[a-z]' '[A-Z]'`
-diff -ru2N grep-2.0/configure.in grep+mb1.04/configure.in
---- grep-2.0/configure.in Sat May 22 13:20:16 1993
-+++ grep+mb1.04/configure.in Fri Jul 9 13:05:32 1993
-@@ -12,5 +12,5 @@
- AC_SIZE_T
- AC_ALLOCA
--AC_HAVE_FUNCS(getpagesize memchr strerror valloc)
-+AC_HAVE_FUNCS(getpagesize memchr strerror valloc bcopy memmove strcasecmp)
- AC_CHAR_UNSIGNED
- AC_CONST
-diff -ru2N grep-2.0/dfa.c grep+mb1.04/dfa.c
---- grep-2.0/dfa.c Mon May 31 08:02:20 1993
-+++ grep+mb1.04/dfa.c Sat Jul 10 01:17:14 1993
-@@ -18,4 +18,6 @@
- /* Written June, 1988 by Mike Haertel
- Modified July, 1988 by Arthur David Olson to assist BMG speedups */
-+/* Multi-byte extension added May, 1993 by t^2 (Takahiro Tanimoto)
-+ Last change: Jul. 10, 1993 by t^2 */
-
- #include <assert.h>
-@@ -35,4 +37,8 @@
- #undef index
- #define index strchr
-+#undef bcopy
-+#define bcopy(s, d, n) memcpy(d, s, n)
-+#undef bzero
-+#define bzero(d, n) memset(d, 0, n)
- #else
- #include <strings.h>
-@@ -71,4 +77,5 @@
- #include "dfa.h"
- #include "regex.h"
-+#include "mbc.h"
-
- #if __STDC__
-@@ -141,5 +148,8 @@
- fprintf(stderr, "END");
- else if (t < NOTCHAR)
-- fprintf(stderr, "%c", t);
-+ if (t & 0x80)
-+ fprintf(stderr, "0x%02x", (unsigned char)t);
-+ else
-+ fprintf(stderr, "%c", t);
- else
- {
-@@ -239,4 +249,16 @@
- }
-
-+static int
-+isemptyset(s)
-+ charclass s;
-+{
-+ int i;
-+
-+ for (i = 0; i < CHARCLASS_INTS; i++)
-+ if (s[i])
-+ return 0;
-+ return 1;
-+}
-+
- /* A pointer to the current dfa is kept here during parsing. */
- static struct dfa *dfa;
-@@ -259,5 +281,6 @@
-
- /* Syntax bits controlling the behavior of the lexical analyzer. */
--static int syntax_bits, syntax_bits_set;
-+static unsigned long syntax_bits;
-+static int syntax_bits_set;
-
- /* Flag for case-folding letters into sets. */
-@@ -267,5 +290,5 @@
- void
- dfasyntax(bits, fold)
-- int bits;
-+ unsigned long bits;
- int fold;
- {
-@@ -289,4 +312,66 @@
- static int minrep, maxrep; /* Repeat counts for {m,n}. */
-
-+static charclass cs_cset[8];
-+static token cs_tok[8] = {0, 0, 0, 0, 0, 0, 0, 0};
-+
-+static enum {
-+ MBEXTTOK_NONE = -1,
-+ MBEXTTOK_NOTCHAR = 256,
-+ MBEXTTOK_ORMBC = MBEXTTOK_NOTCHAR,
-+ MBEXTTOK_ORMBC_NL,
-+ MBEXTTOK_CLASS,
-+ MBEXTTOK_INVCLASS,
-+} mbexttok = MBEXTTOK_NONE;
-+
-+static charclass mbcset_set;
-+static charclass mbcset_all;
-+static charclass mbcset[128]; /* 128*256/8 = 4 Kbytes */
-+
-+/* $BIQHK$K;HMQ$5$l$k(B ($B$H;W$o$l$k(B) $BJ8;z=89g$r%H!<%/%s$H$7$FJV$9(B.
-+ n = 0 ... 1$B%P%$%HJ8;zA4BN$N=89g(B.
-+ 1 ... 2$B%P%$%HJ8;z$N(B1$B%P%$%HL\A4BN$N=89g(B.
-+ 2 ... 2$B%P%$%HJ8;z$N(B2$B%P%$%HL\A4BN$N=89g(B.
-+ +4 ... '\n'$B$r=|30$7$J$$(B. */
-+static token
-+setcodeset(n)
-+ int n;
-+{
-+ token c;
-+
-+ if (!cs_tok[n]) {
-+ zeroset(cs_cset[n]);
-+ switch (n) {
-+ case 0:
-+ case 4:
-+ /* 1$B%P%$%HJ8;zA4BN$N=89g(B. */
-+ for (c = 0; c < NOTCHAR; c++)
-+ if (ismbchar(c))
-+ setbit(c, cs_cset[n]);
-+ notset(cs_cset[n]);
-+ break;
-+ case 1:
-+ case 5:
-+ /* 2$B%P%$%HJ8;z$N(B1$BJ8;zL\A4BN$N=89g(B. */
-+ for (c = 0; c < NOTCHAR; c++)
-+ if (ismbchar(c))
-+ setbit(c, cs_cset[n]);
-+ break;
-+ case 2:
-+ case 6:
-+ /* 2$B%P%$%HJ8;z$N(B2$BJ8;zL\A4BN$N=89g(B. */
-+ notset(cs_cset[n]);
-+ break;
-+ }
-+ if (!(n & 4)) {
-+ if (syntax_bits & RE_DOT_NOT_NULL || n != 0)
-+ clrbit('\0', cs_cset[n]);
-+ if (!(syntax_bits & RE_DOT_NEWLINE) || n != 0)
-+ clrbit('\n', cs_cset[n]);
-+ }
-+ cs_tok[n] = CSET + charclass_index(cs_cset[n]);
-+ }
-+ return cs_tok[n];
-+}
-+
- /* Note that characters become unsigned here. */
- #define FETCH(c, eoferr) \
-@@ -362,4 +447,5 @@
- it means that just about every case begins with
- "if (backslash) ...". */
-+ mbexttok = MBEXTTOK_NONE;
- for (i = 0; i < 2; ++i)
- {
-@@ -543,14 +629,19 @@
- if (backslash)
- goto normal_char;
-+ if (current_mbctype != MBCTYPE_ASCII)
-+ mbexttok = MBEXTTOK_ORMBC;
-+ laststart = 0;
-+ return setcodeset(0);
-+
-+ case 'w':
-+ if (!backslash)
-+ goto normal_char;
- zeroset(ccl);
-- notset(ccl);
-- if (!(syntax_bits & RE_DOT_NEWLINE))
-- clrbit('\n', ccl);
-- if (syntax_bits & RE_DOT_NOT_NULL)
-- clrbit('\0', ccl);
-+ for (c2 = 0; c2 < NOTCHAR; ++c2)
-+ if (ISALNUM(c2))
-+ setbit(c2, ccl);
- laststart = 0;
- return lasttok = CSET + charclass_index(ccl);
-
-- case 'w':
- case 'W':
- if (!backslash)
-@@ -558,8 +649,7 @@
- zeroset(ccl);
- for (c2 = 0; c2 < NOTCHAR; ++c2)
-- if (ISALNUM(c2))
-+ if (!ISALNUM(c2) && !ismbchar(c2))
- setbit(c2, ccl);
-- if (c == 'W')
-- notset(ccl);
-+ mbexttok = MBEXTTOK_ORMBC_NL;
- laststart = 0;
- return lasttok = CSET + charclass_index(ccl);
-@@ -579,4 +669,6 @@
- do
- {
-+ unsigned char ch = 0, c2h = 0;
-+
- /* Nobody ever said this had to be fast. :-)
- Note that if we're looking at some other [:...:]
-@@ -599,4 +691,8 @@
- if (c == '\\' && (syntax_bits & RE_BACKSLASH_ESCAPE_IN_LISTS))
- FETCH(c, "Unbalanced [");
-+ if (ismbchar(c)) {
-+ ch = (unsigned char)c;
-+ FETCH(c, "Multi-byte char incomplete");
-+ }
- FETCH(c1, "Unbalanced [");
- if (c1 == '-')
-@@ -616,19 +712,83 @@
- && (syntax_bits & RE_BACKSLASH_ESCAPE_IN_LISTS))
- FETCH(c2, "Unbalanced [");
-+ if (ismbchar(c2)) {
-+ c2h = (unsigned char)c2;
-+ FETCH(c2, "Multi-byte char incomplete");
-+ }
- FETCH(c1, "Unbalanced [");
- }
- }
-- else
-+ else {
-+ c2h = ch;
- c2 = c;
-- while (c <= c2)
-- {
-- setbit(c, ccl);
-- if (case_fold)
-- if (ISUPPER(c))
-- setbit(tolower(c), ccl);
-- else if (ISLOWER(c))
-- setbit(toupper(c), ccl);
-- ++c;
-+ }
-+ if (ch < c2h || (ch == c2h && c <= c2)) {
-+ if (ch == 0) {
-+ ch = (unsigned char)c2;
-+ if (c2h > 0)
-+ ch = NOTCHAR - 1;
-+ for (; (unsigned char)c <= ch; c++) {
-+ setbit(c, ccl);
-+ if (case_fold) {
-+ if (ISUPPER(c))
-+ setbit(tolower(c), ccl);
-+ else if (ISLOWER(c))
-+ setbit(toupper(c), ccl);
-+ }
-+ }
-+ ch = 0x80;
-+ c = 0x00;
- }
-+ if (ch <= c2h) {
-+ if (mbexttok < 0) {
-+ mbexttok = MBEXTTOK_CLASS;
-+ zeroset(mbcset_set);
-+ zeroset(mbcset_all);
-+ }
-+ if (ch < c2h && c != 0x00) { /* $B:G=i$NH>C<(B */
-+ int t;
-+
-+ if (ismbchar(ch)
-+ && ((t = tstbit(ch, mbcset_set))
-+ || !tstbit(ch, mbcset_all))) {
-+ if (!t) {
-+ setbit(ch, mbcset_set);
-+ zeroset(mbcset[ch - 0x80]);
-+ }
-+ for (; c < NOTCHAR; c++)
-+ setbit(c, mbcset[ch - 0x80]);
-+ }
-+ ch++;
-+ c = 0x00;
-+ }
-+ if (ch < c2h || (ch == c2h && c == 0x00 && c2 == 0xff)) {
-+ if (c == 0x00 && c2 == 0xff)
-+ c2h++;
-+ for (; ch < c2h; ch++)
-+ if (ismbchar(ch)) {
-+ clrbit(ch, mbcset_set);
-+ setbit(ch, mbcset_all);
-+ }
-+ if (c == 0x00 && c2 == 0xff)
-+ c2h--;
-+ c = 0x00;
-+ }
-+ if (ch <= c2h) {
-+ int t;
-+
-+ /* $B$3$3$G$OI,$:(B c <= c2 $B$H$J$C$F$$$k(B. */
-+ if (ismbchar(ch)
-+ && ((t = tstbit(ch, mbcset_set))
-+ || !tstbit(ch, mbcset_all))) {
-+ if (!t) {
-+ setbit(ch, mbcset_set);
-+ zeroset(mbcset[ch - 0x80]);
-+ }
-+ for (; c <= c2; c++)
-+ setbit(c, mbcset[ch - 0x80]);
-+ }
-+ }
-+ }
-+ }
- skip:
- ;
-@@ -640,5 +800,20 @@
- if (syntax_bits & RE_HAT_LISTS_NOT_NEWLINE)
- clrbit('\n', ccl);
-+ if (mbexttok == MBEXTTOK_CLASS) {
-+ mbexttok = MBEXTTOK_INVCLASS;
-+ if (!isemptyset(mbcset_set)) {
-+ for (c = 0x80; c <= 0xff; c++)
-+ if (tstbit(c, mbcset_set))
-+ notset(mbcset[c - 0x80]);
-+ }
-+ notset(mbcset_all);
-+ }
-+ else
-+ mbexttok = MBEXTTOK_ORMBC_NL;
- }
-+ if (current_mbctype != MBCTYPE_ASCII)
-+ for (c = 0x80; c <= 0xff; c++)
-+ if (ismbchar(c))
-+ clrbit(c, ccl);
- laststart = 0;
- return lasttok = CSET + charclass_index(ccl);
-@@ -647,4 +822,8 @@
- normal_char:
- laststart = 0;
-+ if (ismbchar(c)) {
-+ FETCH(mbexttok, "Multi-byte char incomplete");
-+ return c;
-+ }
- if (case_fold && ISALPHA(c))
- {
-@@ -746,5 +925,67 @@
- atom()
- {
-- if ((tok >= 0 && tok < NOTCHAR) || tok >= CSET || tok == BACKREF
-+ if (mbexttok >= 0) {
-+ if (mbexttok < MBEXTTOK_NOTCHAR) {
-+ addtok(tok);
-+ addtok(mbexttok);
-+ addtok(CAT);
-+ }
-+ else
-+ switch (mbexttok) {
-+ case MBEXTTOK_ORMBC:
-+ case MBEXTTOK_ORMBC_NL:
-+ addtok(tok);
-+ if (mbexttok == MBEXTTOK_ORMBC) {
-+ addtok(setcodeset(1));
-+ addtok(setcodeset(2));
-+ }
-+ else {
-+ addtok(setcodeset(5));
-+ addtok(setcodeset(6));
-+ }
-+ addtok(CAT);
-+ addtok(OR);
-+ break;
-+ case MBEXTTOK_CLASS:
-+ case MBEXTTOK_INVCLASS:
-+ {
-+ token c;
-+
-+ addtok(tok);
-+ if (!isemptyset(mbcset_set))
-+ for (c = 0x80; c <= 0xff; c++)
-+ if (tstbit(c, mbcset_set)) {
-+ /* Make sure all bits in mbcset_all valid. */
-+ clrbit(c, mbcset_all);
-+ addtok(c);
-+ if (mbexttok == MBEXTTOK_CLASS) {
-+ clrbit('\n', mbcset[c - 0x80]);
-+ clrbit('\0', mbcset[c - 0x80]);
-+ }
-+ else {
-+ setbit('\n', mbcset[c - 0x80]);
-+ setbit('\0', mbcset[c - 0x80]);
-+ }
-+ addtok(CSET + charclass_index(mbcset[c - 0x80]));
-+ addtok(CAT);
-+ addtok(OR);
-+ }
-+ if (!isemptyset(mbcset_all)) {
-+ addtok(CSET + charclass_index(mbcset_all));
-+ if (mbexttok == MBEXTTOK_CLASS)
-+ addtok(setcodeset(2));
-+ else
-+ addtok(setcodeset(6));
-+ addtok(CAT);
-+ addtok(OR);
-+ }
-+ }
-+ break;
-+ default:
-+ break;
-+ }
-+ tok = lex();
-+ }
-+ else if ((tok >= 0 && tok < NOTCHAR) || tok >= CSET || tok == BACKREF
- || tok == BEGLINE || tok == ENDLINE || tok == BEGWORD
- || tok == ENDWORD || tok == LIMWORD || tok == NOTLIMWORD)
-@@ -1904,4 +2145,6 @@
-
- d->musts = 0;
-+
-+ bzero(cs_tok, sizeof cs_tok);
- }
-
-@@ -1916,8 +2159,8 @@
- if (case_fold) /* dummy folding in service of dfamust() */
- {
-- char *copy;
-+ char *copy, *p;
- int i;
-
-- copy = malloc(len);
-+ p = copy = malloc(len + 7);
- if (!copy)
- dfaerror("out of memory");
-@@ -1925,23 +2168,61 @@
- /* This is a kludge. */
- case_fold = 0;
-+ if (current_mbctype != MBCTYPE_ASCII && searchflag) {
-+ *p++ = '^';
-+ *p++ = '.';
-+ *p++ = '*';
-+ if (!(syntax_bits & RE_NO_BK_PARENS))
-+ *p++ = '\\';
-+ *p++ = '(';
-+ }
- for (i = 0; i < len; ++i)
- if (ISUPPER(s[i]))
-- copy[i] = tolower(s[i]);
-+ *p++ = tolower((unsigned char)s[i]);
- else
-- copy[i] = s[i];
-+ *p++ = s[i];
-+ if (current_mbctype != MBCTYPE_ASCII && searchflag) {
-+ if (!(syntax_bits & RE_NO_BK_PARENS))
-+ *p++ = '\\';
-+ *p++ = ')';
-+ }
-
- dfainit(d);
-- dfaparse(copy, len, d);
-- free(copy);
-+ dfaparse(copy, p - copy, d);
- dfamust(d);
- d->cindex = d->tindex = d->depth = d->nleaves = d->nregexps = 0;
-+ bzero(cs_tok, sizeof cs_tok);
- case_fold = 1;
-- dfaparse(s, len, d);
-+ if (current_mbctype != MBCTYPE_ASCII && searchflag) {
-+ bcopy(s, copy + (syntax_bits & RE_NO_BK_PARENS ? 4 : 5), len);
-+ dfaparse(copy, p - copy, d);
-+ }
-+ else
-+ dfaparse(s, len, d);
- dfaanalyze(d, searchflag);
-+ free(copy);
- }
- else
- {
- dfainit(d);
-- dfaparse(s, len, d);
-+ if (current_mbctype != MBCTYPE_ASCII && searchflag) {
-+ char *copy, *p;
-+
-+ p = copy = malloc(len + 7);
-+ *p++ = '^';
-+ *p++ = '.';
-+ *p++ = '*';
-+ if (!(syntax_bits & RE_NO_BK_PARENS))
-+ *p++ = '\\';
-+ *p++ = '(';
-+ bcopy(s, p, len);
-+ p += len;
-+ if (!(syntax_bits & RE_NO_BK_PARENS))
-+ *p++ = '\\';
-+ *p++ = ')';
-+ dfaparse(copy, p - copy, d);
-+ free(copy);
-+ }
-+ else
-+ dfaparse(s, len, d);
- dfamust(d);
- dfaanalyze(d, searchflag);
-diff -ru2N grep-2.0/dfa.h grep+mb1.04/dfa.h
---- grep-2.0/dfa.h Mon Apr 12 06:17:22 1993
-+++ grep+mb1.04/dfa.h Wed Jul 7 17:02:13 1993
-@@ -15,4 +15,6 @@
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
-+/* Multi-byte extension added May, 1993 by t^2 (Takahiro Tanimoto)
-+ Last change: Jul. 7, 1993 by t^2 */
-
- /* Written June, 1988 by Mike Haertel */
-@@ -306,5 +308,5 @@
- /* dfasyntax() takes two arguments; the first sets the syntax bits described
- earlier in this file, and the second sets the case-folding flag. */
--extern void dfasyntax(int, int);
-+extern void dfasyntax(unsigned long, int);
-
- /* Compile the given string of the given length into the given struct dfa.
-diff -ru2N grep-2.0/getpagesize.h grep+mb1.04/getpagesize.h
---- grep-2.0/getpagesize.h Fri May 21 14:18:58 1993
-+++ grep+mb1.04/getpagesize.h Sat Jul 10 02:19:10 1993
-@@ -1,2 +1,4 @@
-+/* Multi-byte extension added Jul., 1993 by t^2 (Takahiro Tanimoto)
-+ Last change: Jul. 10, 1993 by t^2 */
- #ifdef BSD
- #ifndef BSD4_1
-@@ -35,5 +37,9 @@
- #endif /* no EXEC_PAGESIZE */
- #else /* !HAVE_SYS_PARAM_H */
-+#ifndef MSDOS
- #define getpagesize() 8192 /* punt totally */
-+#else
-+#define getpagesize() 4096
-+#endif
- #endif /* !HAVE_SYS_PARAM_H */
- #endif /* no _SC_PAGESIZE */
-diff -ru2N grep-2.0/grep.c grep+mb1.04/grep.c
---- grep-2.0/grep.c Sun May 23 14:52:52 1993
-+++ grep+mb1.04/grep.c Thu Jun 2 17:01:53 1994
-@@ -17,4 +17,6 @@
-
- Written July 1992 by Mike Haertel. */
-+/* Multi-byte extension added May, 1993 by t^2 (Takahiro Tanimoto)
-+ Last change: Jun. 2, 1994 by t^2 */
-
- #include <errno.h>
-@@ -22,6 +24,8 @@
-
- #ifndef errno
-+#ifndef MSDOS
- extern int errno;
- #endif
-+#endif
-
- #ifdef STDC_HEADERS
-@@ -59,4 +63,5 @@
- #include "getpagesize.h"
- #include "grep.h"
-+#include "mbc.h"
-
- #undef MAX
-@@ -315,6 +320,6 @@
- cc = read(bufdesc, buffer + bufsalloc, bufalloc - bufsalloc);
- #endif
-- if (cc > 0)
-- buflim = buffer + bufsalloc + cc;
-+ if (cc != -1)
-+ buflim = buffer + bufsalloc + (unsigned)cc;
- else
- buflim = buffer + bufsalloc;
-@@ -332,10 +337,10 @@
-
- /* Internal variables to keep track of byte count, context, etc. */
--static size_t totalcc; /* Total character count before bufbeg. */
-+static unsigned long totalcc; /* Total character count before bufbeg. */
- static char *lastnl; /* Pointer after last newline counted. */
- static char *lastout; /* Pointer after last character output;
- NULL if no character has been output
- or if it's conceptually before bufbeg. */
--static size_t totalnl; /* Total newline count before lastnl. */
-+static unsigned long totalnl; /* Total newline count before lastnl. */
- static int pending; /* Pending lines of output. */
-
-@@ -363,5 +368,5 @@
- {
- nlscan(beg);
-- printf("%d%c", ++totalnl, sep);
-+ printf("%lu%c", ++totalnl, sep);
- lastnl = lim;
- }
-@@ -519,5 +524,5 @@
- for (;;)
- {
-- if (fillbuf(save) < 0)
-+ if (fillbuf(save) == -1)
- {
- error(filename, errno);
-@@ -564,8 +569,10 @@
- }
-
--static char version[] = "GNU grep version 2.0";
-+static char version[] = "GNU grep version 2.0\
-+ + multi-byte extension 1.04";
-
- #define USAGE \
-- "usage: %s [-[[AB] ]<num>] [-[CEFGVchilnqsvwx]] [-[ef]] <expr> [<files...>]\n"
-+ "usage: %s [-[[AB] ]<num>] [-[CEFGVchilnqsvwx]] [-W ctype=...]\n\
-+ [-[ef]] <expr> [<files...>]\n"
-
- static void
-@@ -594,4 +601,32 @@
- }
-
-+#ifndef HAVE_STRCASECMP
-+
-+static int
-+#ifdef __STDC__
-+strcasecmp(const char *s1, const char *s2)
-+#else
-+strcasecmp(s1, s2)
-+ char *s1, *s2;
-+#endif
-+{
-+ unsigned char c1, c2;
-+
-+ while ((c1 = *s1++)) {
-+ if ((unsigned char)(c1 - 'A') <= (unsigned char)('Z' - 'A'))
-+ c1 += 'a' - 'A';
-+ c2 = *s2++;
-+ if ((unsigned char)(c2 - 'A') <= (unsigned char)('Z' - 'A'))
-+ c2 += 'a' - 'A';
-+ if (c1 != c2) {
-+ --s2;
-+ break;
-+ }
-+ }
-+ return c1 - (unsigned char)*s2;
-+}
-+
-+#endif
-+
- int
- main(argc, argv)
-@@ -607,7 +642,27 @@
- extern int optind;
-
-- prog = argv[0];
-- if (prog && strrchr(prog, '/'))
-- prog = strrchr(prog, '/') + 1;
-+ if ((prog = argv[0]) && prog[0]) {
-+ char c, *p;
-+#ifdef MSDOS
-+ static char progname[8 + 1];
-+#endif
-+
-+ for (p = prog; (c = *p++); )
-+ if (c == '/'
-+#ifdef MSDOS
-+ || c == '\\' || c == ':'
-+#endif
-+ )
-+ prog = p;
-+#ifdef MSDOS
-+ for (p = progname; p < &progname[8] && (c = *prog++) && c != '.'; ) {
-+ if ((unsigned char)(c - 'A') <= (unsigned char)('Z' - 'A'))
-+ c += 'a' - 'A';
-+ *p++ = c;
-+ }
-+ *p++ = '\0';
-+ prog = argv[0] = progname;
-+#endif
-+ }
-
- keys = NULL;
-@@ -620,5 +675,5 @@
- matcher = NULL;
-
-- while ((opt = getopt(argc, argv, "0123456789A:B:CEFGVX:bce:f:hiLlnqsvwxy"))
-+ while ((opt = getopt(argc, argv, "0123456789A:B:CEFGVX:bce:f:hiLlnqsvwxyW:"))
- != EOF)
- switch (opt)
-@@ -747,4 +802,19 @@
- case 'x':
- match_lines = 1;
-+ break;
-+ case 'W':
-+ if (strcasecmp(optarg, "ctype=ASCII") == 0) {
-+ mbcinit(MBCTYPE_ASCII);
-+ break;
-+ }
-+ if (strcasecmp(optarg, "ctype=EUC") == 0) {
-+ mbcinit(MBCTYPE_EUC);
-+ break;
-+ }
-+ if (strcasecmp(optarg, "ctype=SJIS") == 0) {
-+ mbcinit(MBCTYPE_SJIS);
-+ break;
-+ }
-+ fatal("unknown argument to -Wctype", 0);
- break;
- default:
-diff -ru2N grep-2.0/kwset.c grep+mb1.04/kwset.c
---- grep-2.0/kwset.c Mon May 3 04:26:20 1993
-+++ grep+mb1.04/kwset.c Fri Jul 9 14:54:46 1993
-@@ -19,4 +19,6 @@
- The author may be reached (Email) at the address mike@ai.mit.edu,
- or (US mail) as Mike Haertel c/o Free Software Foundation. */
-+/* Multi-byte extension added Jul, 1993 by t^2 (Takahiro Tanimoto)
-+ Last change: Jul. 9, 1993 by t^2 */
-
- /* The algorithm implemented by these routines bears a startling resemblence
-@@ -592,5 +594,5 @@
- if (d != 0)
- continue;
-- if (tp[-2] == gc)
-+ if (U(tp[-2]) == gc)
- {
- for (i = 3; i <= len && U(tp[-i]) == U(sp[-i]); ++i)
-diff -ru2N grep-2.0/mbc.c grep+mb1.04/mbc.c
---- grep-2.0/mbc.c Thu Jan 1 09:00:00 1970
-+++ grep+mb1.04/mbc.c Fri Jul 9 14:38:28 1993
-@@ -0,0 +1,98 @@
-+/* Functions for multi-byte support.
-+ Created for grep multi-byte extension Jul., 1993 by t^2 (Takahiro Tanimoto)
-+ Last change: Jul. 9, 1993 by t^2 */
-+#include "mbc.h"
-+
-+static const unsigned char mbctab_ascii[] = {
-+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-+};
-+
-+static const unsigned char mbctab_euc[] = {
-+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
-+};
-+
-+static const unsigned char mbctab_sjis[] = {
-+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
-+};
-+
-+#ifdef EUC
-+const unsigned char *mbctab = mbctab_euc;
-+int current_mbctype = MBCTYPE_EUC;
-+#else
-+#ifdef SJIS
-+const unsigned char *mbctab = mbctab_sjis;
-+int current_mbctype = MBCTYPE_SJIS;
-+#else
-+const unsigned char *mbctab = mbctab_ascii;
-+int current_mbctype = MBCTYPE_ASCII;
-+#endif
-+#endif
-+
-+void
-+#ifdef __STDC__
-+mbcinit(int mbctype)
-+#else
-+mbcinit(mbctype)
-+ int mbctype;
-+#endif
-+{
-+ switch (mbctype) {
-+ case MBCTYPE_ASCII:
-+ mbctab = mbctab_ascii;
-+ current_mbctype = MBCTYPE_ASCII;
-+ break;
-+ case MBCTYPE_EUC:
-+ mbctab = mbctab_euc;
-+ current_mbctype = MBCTYPE_EUC;
-+ break;
-+ case MBCTYPE_SJIS:
-+ mbctab = mbctab_sjis;
-+ current_mbctype = MBCTYPE_SJIS;
-+ break;
-+ }
-+}
-diff -ru2N grep-2.0/mbc.h grep+mb1.04/mbc.h
---- grep-2.0/mbc.h Thu Jan 1 09:00:00 1970
-+++ grep+mb1.04/mbc.h Fri Jul 9 14:40:03 1993
-@@ -0,0 +1,38 @@
-+#ifndef MBC_H
-+#define MBC_H 1
-+/* Definitions for multi-byte support.
-+ Created for grep multi-byte extension Jul., 1993 by t^2 (Takahiro Tanimoto)
-+ Last change: Jul. 9, 1993 by t^2 */
-+
-+#ifndef const
-+#ifndef __STDC__
-+#ifdef __GNUC__
-+#define const __const__
-+#define volatile __volatile__
-+#else
-+#define const
-+#define volatile
-+#endif
-+#endif
-+#endif
-+
-+#ifndef _
-+#ifdef __STDC__
-+#define _(x) x
-+#else
-+#define _(x) ()
-+#endif
-+#endif
-+
-+#define MBCTYPE_ASCII 0
-+#define MBCTYPE_EUC 1
-+#define MBCTYPE_SJIS 2
-+
-+extern const unsigned char *mbctab;
-+extern int current_mbctype;
-+
-+void mbcinit _((int));
-+
-+#define ismbchar(c) mbctab[(unsigned char)c]
-+
-+#endif /* !MBC_H */
-diff -ru2N grep-2.0/obstack.h grep+mb1.04/obstack.h
---- grep-2.0/obstack.h Sat May 22 11:55:23 1993
-+++ grep+mb1.04/obstack.h Sat Jul 10 04:47:06 1993
-@@ -15,4 +15,6 @@
- along with this program; if not, write to the Free Software
- Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
-+/* Multi-byte extension added Jul., 1993 by t^2 (Takahiro Tanimoto)
-+ Last change: Jul. 10, 1993 by t^2 */
-
- /* Summary:
-@@ -136,4 +138,5 @@
- #endif
-
-+#ifndef PTR_INT_TYPE
- #ifdef __STDC__
- #define PTR_INT_TYPE ptrdiff_t
-@@ -141,4 +144,5 @@
- #define PTR_INT_TYPE long
- #endif
-+#endif
-
- struct _obstack_chunk /* Lives at front of each chunk. */
-@@ -151,5 +155,5 @@
- struct obstack /* control current object in current chunk */
- {
-- long chunk_size; /* preferred size to allocate chunks in */
-+ unsigned chunk_size; /* preferred size to allocate chunks in */
- struct _obstack_chunk* chunk; /* address of current struct obstack_chunk */
- char *object_base; /* address of object we are building */
-diff -ru2N grep-2.0/regex.c grep+mb1.04/regex.c
---- grep-2.0/regex.c Fri May 21 14:11:40 1993
-+++ grep+mb1.04/regex.c Thu Aug 19 04:37:03 1993
-@@ -19,4 +19,6 @@
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
-+/* Multi-byte extension added May, 1993 by t^2 (Takahiro Tanimoto)
-+ Last change: Aug. 19, 1993 by t^2 */
-
- /* AIX requires this to be the first thing in the file. */
-@@ -54,6 +56,33 @@
- #define bcmp(s1, s2, n) memcmp ((s1), (s2), (n))
- #endif
-+#ifdef HAVE_MEMMOVE
- #ifndef bcopy
--#define bcopy(s, d, n) memcpy ((d), (s), (n))
-+#define bcopy(s, d, n) memmove ((d), (s), (n))
-+#endif
-+#else
-+#ifndef HAVE_BCOPY
-+static void
-+#ifdef __STDC__
-+bcopy (const void *s0, void *d0, size_t n)
-+#else
-+bcopy (s, d, n)
-+ const void *s0;
-+ void *d;
-+ size_t n;
-+#endif
-+{
-+ const char *s = s0;
-+ char *d = d0;
-+
-+ if (s < d) {
-+ s += n, d += n;
-+ while (n--)
-+ *--d = *--s;
-+ }
-+ else
-+ while (n--)
-+ *d++ = *s++;
-+}
-+#endif
- #endif
- #ifndef bzero
-@@ -124,4 +153,5 @@
- /* Get the interface, including the syntax bits. */
- #include "regex.h"
-+#include "mbc.h"
-
- /* isalpha etc. are used for the character classes. */
-@@ -462,4 +492,19 @@
-
- #endif /* DEBUG */
-+
-+#define STORE_MBC(p, c) \
-+ ((p)[0] = (unsigned char) ((c) >> 8), (p)[1] = (unsigned char) (c))
-+#define STORE_MBC_AND_INCR(p, c) \
-+ (*(p)++ = (unsigned char) ((c) >> 8), *(p)++ = (unsigned char) (c))
-+
-+#define EXTRACT_MBC(p) \
-+ ((unsigned char) (p)[0] << 8 | (unsigned char) (p)[1])
-+#define EXTRACT_MBC_AND_INCR(p) \
-+ ((p) += 2, (unsigned char) (p)[-2] << 8 | (unsigned char) (p)[-1])
-+
-+#define EXTRACT_UNSIGNED(p) \
-+ ((unsigned char) (p)[0] | (unsigned char) (p)[1] << 8)
-+#define EXTRACT_UNSIGNED_AND_INCR(p) \
-+ ((p) += 2, (unsigned char) (p)[-2] | (unsigned char) (p)[-1] << 8)
-
- /* If DEBUG is defined, Regex prints many voluminous messages about what
-@@ -558,4 +603,8 @@
- {
- putchar ('/');
-+ if (ismbchar (*p) && 2 <= mcnt) {
-+ printf ("/%.2s", (char *) p), p += 2, --mcnt;
-+ continue;
-+ }
- printchar (*p++);
- }
-@@ -618,7 +667,14 @@
- printchar (last);
-
-- putchar (']');
--
- p += 1 + *p;
-+ {
-+ unsigned short i, size;
-+
-+ size = EXTRACT_UNSIGNED_AND_INCR (p);
-+ for (i = 0; i < size; i++)
-+ printf ("%.2s-%.2s", (char *) p, (char *) p + 2),
-+ p += 4;
-+ }
-+ putchar (']');
- }
- break;
-@@ -779,5 +835,5 @@
- printf ("not_bol: %d\t", bufp->not_bol);
- printf ("not_eol: %d\t", bufp->not_eol);
-- printf ("syntax: %d\n", bufp->syntax);
-+ printf ("syntax: %lu\n", bufp->syntax);
- /* Perhaps we should print the translate table? */
- }
-@@ -878,5 +934,7 @@
- static boolean at_begline_loc_p (), at_endline_loc_p ();
- static boolean group_in_compile_stack ();
-+#if 0
- static reg_errcode_t compile_range ();
-+#endif
-
- /* Fetch the next character in the uncompiled pattern---translating it
-@@ -887,5 +945,6 @@
- do {if (p == pend) return REG_EEND; \
- c = (unsigned char) *p++; \
-- if (translate) c = translate[c]; \
-+ if (translate && !ismbchar (c)) \
-+ c = (unsigned char) translate[(unsigned char) c]; \
- } while (0)
-
-@@ -905,5 +964,7 @@
- `char *', to avoid warnings when a string constant is passed. But
- when we use a character as a subscript we must make it unsigned. */
--#define TRANSLATE(d) (translate ? translate[(unsigned char) (d)] : (d))
-+#define TRANSLATE(d) (translate \
-+ ? (unsigned char) translate[(unsigned char) (d)] \
-+ : (d))
-
-
-@@ -1075,4 +1136,159 @@
- || STREQ (string, "cntrl") || STREQ (string, "blank"))
-
-+/* Handle charset(_not)?.
-+
-+ Structure of charset(_not)? in compiled pattern.
-+
-+ struct {
-+ unsinged char id; charset(_not)?
-+ unsigned char sbc_size;
-+ unsigned char sbc_map[sbc_size]; same as original up to here.
-+ unsigned short mbc_size; number of intervals.
-+ struct {
-+ unsigned short beg; beginning of interval.
-+ unsigned short end; end of interval.
-+ } intervals[mbc_size];
-+ }; */
-+
-+static reg_errcode_t
-+#ifdef __STDC__
-+set_list_bits (unsigned short c1, unsigned short c2,
-+ reg_syntax_t syntax, unsigned char *b, const char *translate)
-+#else
-+set_list_bits (c1, c2, syntax, b, translate)
-+ unsigned short c1, c2;
-+ reg_syntax_t syntax;
-+ unsigned char *b;
-+ const char *translate;
-+#endif
-+{
-+ unsigned char sbc_size = b[-1];
-+ unsigned short mbc_size = EXTRACT_UNSIGNED (&b[sbc_size]);
-+ unsigned short beg, end, upb;
-+
-+ if (c1 > c2)
-+ return syntax & RE_NO_EMPTY_RANGES ? REG_ERANGE : REG_NOERROR;
-+ if (c1 < 1 << BYTEWIDTH) {
-+ upb = c2;
-+ if (1 << BYTEWIDTH <= upb)
-+ upb = (1 << BYTEWIDTH) - 1; /* The last single-byte char */
-+ if (sbc_size <= upb / BYTEWIDTH) {
-+ /* Allocate maximum size so it never happens again. */
-+ /* NOTE: memcpy() would not work here. */
-+ bcopy (&b[sbc_size], &b[(1 << BYTEWIDTH) / BYTEWIDTH], 2 + mbc_size*4);
-+ bzero (&b[sbc_size], (1 << BYTEWIDTH) / BYTEWIDTH - sbc_size);
-+ b[-1] = sbc_size = (1 << BYTEWIDTH) / BYTEWIDTH;
-+ }
-+ if (!translate) {
-+ for (; c1 <= upb; c1++)
-+ if (!ismbchar (c1))
-+ SET_LIST_BIT (c1);
-+ }
-+ else
-+ for (; c1 <= upb; c1++)
-+ if (!ismbchar (c1))
-+ SET_LIST_BIT (TRANSLATE (c1));
-+ if (c2 < 1 << BYTEWIDTH)
-+ return REG_NOERROR;
-+ c1 = 0x8000; /* The first wide char */
-+ }
-+ b = &b[sbc_size + 2];
-+
-+ /* intervals[beg]
-+ $B!|(B----------$B!|(B $B!|(B----------$B!|(B
-+ c1
-+ $B!{(B----------------------$B!|(B
-+
-+ $B>e?^$N$h$&$J6h4V$N%$%s%G%C%/%9(B beg $B$r7hDj$9$k(B. */
-+ for (beg = 0, upb = mbc_size; beg < upb; ) {
-+ unsigned short mid = (beg + upb) >> 1;
-+
-+ if (c1 - 1 > EXTRACT_MBC (&b[mid*4 + 2]))
-+ beg = mid + 1;
-+ else
-+ upb = mid;
-+ }
-+
-+ /* intervals[end]
-+ $B!|(B-------$B!|(B $B!|(B----------$B!|(B
-+ c2
-+ $B!|(B---------------$B!{(B
-+
-+ $B>e?^$N$h$&$J6h4V$N%$%s%G%C%/%9(B end $B$r7hDj$9$k(B. */
-+ for (end = beg, upb = mbc_size; end < upb; ) {
-+ unsigned short mid = (end + upb) >> 1;
-+
-+ if (c2 >= EXTRACT_MBC (&b[mid*4]) - 1)
-+ end = mid + 1;
-+ else
-+ upb = mid;
-+ }
-+
-+ if (beg != end) {
-+ /* $B4{B8$N6h4V$r>/$J$/$H$b(B1$B$DE}9g$9$k>l9g(B,
-+ $B6h4V$N;OE@(B, $B=*E@$r=$@5$9$k(B. */
-+ if (c1 > EXTRACT_MBC (&b[beg*4]))
-+ c1 = EXTRACT_MBC (&b[beg*4]);
-+ if (c2 < EXTRACT_MBC (&b[end*4 - 2]))
-+ c2 = EXTRACT_MBC (&b[end*4 - 2]);
-+ }
-+ if (end < mbc_size && end != beg + 1)
-+ /* $BDI2C$5$l$k6h4V$N8e$m$K4{B8$N6h4V$r0\F0$9$k(B. */
-+ /* NOTE: memcpy() would not work here. */
-+ bcopy (&b[end*4], &b[(beg + 1)*4], (mbc_size - end)*4);
-+ STORE_MBC (&b[beg*4 + 0], c1);
-+ STORE_MBC (&b[beg*4 + 2], c2);
-+ mbc_size += beg + 1 - end;
-+ STORE_NUMBER (&b[-2], mbc_size);
-+ return REG_NOERROR;
-+}
-+
-+static int
-+#ifdef __STDC__
-+is_in_list (unsigned short c, const unsigned char *b)
-+#else
-+is_in_list (c, b)
-+ unsigned short c;
-+ const unsigned char *b;
-+#endif
-+{
-+ unsigned short size;
-+ int in = (re_opcode_t) b[-1] == charset_not;
-+
-+ size = *b++;
-+ if (c < 1 << BYTEWIDTH) {
-+ if (c / BYTEWIDTH < size && b[c / BYTEWIDTH] & 1 << c % BYTEWIDTH)
-+ in = !in;
-+ }
-+ else {
-+ unsigned short i, j;
-+
-+ b += size + 2;
-+ size = EXTRACT_UNSIGNED (&b[-2]);
-+
-+ /* intervals[i]
-+ $B!|(B-------$B!|(B $B!|(B--------$B!|(B
-+ c
-+ $B!{(B----------------$B!|(B
-+
-+ $B>e?^$N$h$&$J6h4V$N%$%s%G%C%/%9(B i $B$r7hDj$9$k(B. */
-+ for (i = 0, j = size; i < j; ) {
-+ unsigned short k = (i + j) >> 1;
-+
-+ if (c > EXTRACT_MBC (&b[k*4 + 2]))
-+ i = k + 1;
-+ else
-+ j = k;
-+ }
-+ if (i < size && EXTRACT_MBC (&b[i*4]) <= c
-+ /* [...] $B$+$i(B, $BL58z$J%^%k%A%P%$%HJ8;z$r=|30$9$k(B. $B$3$3$G$O4JC1$N(B
-+ $B$?$a#2%P%$%HL\$,(B '\n' $B$^$?$O(B '\0' $B$@$1$rL58z$H$7$?(B. [^...]
-+ $B$N>l9g$O(B, $B5U$KL58z$J%^%k%A%P%$%HJ8;z$r%^%C%A$5$;$k(B. */
-+ && ((unsigned char) c != '\n' && (unsigned char) c != '\0'))
-+ in = !in;
-+ }
-+ return in;
-+}
-+
- /* `regex_compile' compiles PATTERN (of length SIZE) according to SYNTAX.
- Returns one of error codes defined in `regex.h', or zero for success.
-@@ -1385,4 +1601,6 @@
- {
- boolean had_char_class = false;
-+ unsigned short c, c1;
-+ int last_char = -1;
-
- if (p == pend) return REG_EBRACK;
-@@ -1390,5 +1608,6 @@
- /* Ensure that we have enough space to push a charset: the
- opcode, the length count, and the bitset; 34 bytes in all. */
-- GET_BUFFER_SPACE (34);
-+ /* + 2 + 4 for mbcharset(_not)? with just one interval. */
-+ GET_BUFFER_SPACE (34 + 2 + 4);
-
- laststart = b;
-@@ -1407,5 +1626,5 @@
-
- /* Clear the whole map. */
-- bzero (b, (1 << BYTEWIDTH) / BYTEWIDTH);
-+ bzero (b, (1 << BYTEWIDTH) / BYTEWIDTH + 2);
-
- /* charset_not matches newline according to a syntax bit. */
-@@ -1417,7 +1636,14 @@
- for (;;)
- {
-+ int size;
-+
- if (p == pend) return REG_EBRACK;
-
-- PATFETCH (c);
-+ if ((size = EXTRACT_UNSIGNED (&b[(1 << BYTEWIDTH) / BYTEWIDTH])))
-+ /* Ensure the space is enough to hold another interval
-+ of multi-byte chars in charset(_not)?. */
-+ GET_BUFFER_SPACE (32 + 2 + size*4 + 4);
-+
-+ PATFETCH_RAW (c);
-
- /* \ might escape characters inside [...] and [^...]. */
-@@ -1426,6 +1652,16 @@
- if (p == pend) return REG_EESCAPE;
-
-- PATFETCH (c1);
-- SET_LIST_BIT (c1);
-+ PATFETCH_RAW (c1);
-+ if (ismbchar (c1)) {
-+ unsigned char c2;
-+
-+ PATFETCH_RAW (c2);
-+ c1 = c1 << 8 | c2;
-+ (void) set_list_bits (c1, c1, syntax, b, translate);
-+ last_char = c1;
-+ continue;
-+ }
-+ SET_LIST_BIT (TRANSLATE (c1));
-+ last_char = c1;
- continue;
- }
-@@ -1442,4 +1678,11 @@
- return REG_ERANGE;
-
-+ if (ismbchar (c)) {
-+ unsigned char c2;
-+
-+ PATFETCH_RAW (c2);
-+ c = c << 8 | c2;
-+ }
-+
- /* Look ahead to see if it's a range when the last thing
- was a character: if this is a hyphen not at the
-@@ -1447,10 +1690,25 @@
- operator. */
- if (c == '-'
-+#if 0 /* The original was: */
- && !(p - 2 >= pattern && p[-2] == '[')
- && !(p - 3 >= pattern && p[-3] == '[' && p[-2] == '^')
-+#else /* I wonder why he did not write like this.
-+ Have we got any problems? */
-+ && p != p1 + 1
-+#endif
- && *p != ']')
- {
-- reg_errcode_t ret
-- = compile_range (&p, pend, translate, syntax, b);
-+ reg_errcode_t ret;
-+
-+ assert (last_char >= 0);
-+ PATFETCH_RAW (c1);
-+ if (ismbchar (c1)) {
-+ unsigned char c2;
-+
-+ PATFETCH_RAW (c2);
-+ c1 = c1 << 8 | c2;
-+ }
-+ ret = set_list_bits (last_char, c1, syntax, b, translate);
-+ last_char = c1;
- if (ret != REG_NOERROR) return ret;
- }
-@@ -1461,7 +1719,15 @@
-
- /* Move past the `-'. */
-- PATFETCH (c1);
--
-- ret = compile_range (&p, pend, translate, syntax, b);
-+ PATFETCH_RAW (c1);
-+
-+ PATFETCH_RAW (c1);
-+ if (ismbchar (c1)) {
-+ unsigned char c2;
-+
-+ PATFETCH_RAW (c2);
-+ c1 = c1 << 8 | c2;
-+ }
-+ ret = set_list_bits (c, c1, syntax, b, translate);
-+ last_char = c1;
- if (ret != REG_NOERROR) return ret;
- }
-@@ -1474,5 +1740,5 @@
- char str[CHAR_CLASS_MAX_LENGTH + 1];
-
-- PATFETCH (c);
-+ PATFETCH_RAW (c);
- c1 = 0;
-
-@@ -1534,4 +1800,7 @@
- }
- had_char_class = true;
-+#ifdef DEBUG
-+ last_char = -1;
-+#endif
- }
- else
-@@ -1540,7 +1809,13 @@
- while (c1--)
- PATUNFETCH;
-+#if 0 /* The original was: */
- SET_LIST_BIT ('[');
- SET_LIST_BIT (':');
-+#else /* I think this is the right way. */
-+ SET_LIST_BIT (TRANSLATE ('['));
-+ SET_LIST_BIT (TRANSLATE (':'));
-+#endif
- had_char_class = false;
-+ last_char = ':';
- }
- }
-@@ -1548,5 +1823,6 @@
- {
- had_char_class = false;
-- SET_LIST_BIT (c);
-+ (void) set_list_bits (c, c, syntax, b, translate);
-+ last_char = c;
- }
- }
-@@ -1556,5 +1832,9 @@
- while ((int) b[-1] > 0 && b[b[-1] - 1] == 0)
- b[-1]--;
-- b += b[-1];
-+ if (b[-1] != (1 << BYTEWIDTH) / BYTEWIDTH)
-+ bcopy (&b[(1 << BYTEWIDTH) / BYTEWIDTH], &b[b[-1]],
-+ 2 + EXTRACT_UNSIGNED (&b[(1 << BYTEWIDTH) / BYTEWIDTH])*4);
-+ b += b[-1] + 2 + EXTRACT_UNSIGNED (&b[b[-1]])*4;
-+ break;
- }
- break;
-@@ -2023,5 +2303,6 @@
- not to translate; but if we don't translate it
- it will never match anything. */
-- c = TRANSLATE (c);
-+ if (!ismbchar (c))
-+ c = TRANSLATE (c);
- goto normal_char;
- }
-@@ -2032,4 +2313,11 @@
- /* Expects the character in `c'. */
- normal_char:
-+
-+ c1 = 0;
-+ if (ismbchar (c)) {
-+ c1 = c;
-+ PATFETCH_RAW (c);
-+ }
-+
- /* If no exactn currently being built. */
- if (!pending_exact
-@@ -2039,5 +2327,6 @@
-
- /* We have only one byte following the exactn for the count. */
-- || *pending_exact == (1 << BYTEWIDTH) - 1
-+ || *pending_exact >= (c1 ? (1 << BYTEWIDTH) - 2
-+ : (1 << BYTEWIDTH) - 1)
-
- /* If followed by a repetition operator. */
-@@ -2059,4 +2348,8 @@
- }
-
-+ if (c1) {
-+ BUF_PUSH (c1);
-+ (*pending_exact)++;
-+ }
- BUF_PUSH (c);
- (*pending_exact)++;
-@@ -2184,5 +2477,5 @@
- at_endline_loc_p (p, pend, syntax)
- const char *p, *pend;
-- int syntax;
-+ reg_syntax_t syntax;
- {
- const char *next = p;
-@@ -2220,4 +2513,5 @@
-
-
-+#if 0 /* We use set_list_bits() now. */
- /* Read the ending character of a range (in a bracket expression) from the
- uncompiled pattern *P_PTR (which ends at PEND). We assume the
-@@ -2275,4 +2569,5 @@
- return REG_NOERROR;
- }
-+#endif
-
- /* Failure stack declarations and macros; both re_compile_fastmap and
-@@ -2638,18 +2933,65 @@
-
- case charset:
-+ /* NOTE: Charset for single-byte chars never contain
-+ multi-byte char. See set_list_bits(). */
- for (j = *p++ * BYTEWIDTH - 1; j >= 0; j--)
- if (p[j / BYTEWIDTH] & (1 << (j % BYTEWIDTH)))
- fastmap[j] = 1;
-+ {
-+ unsigned short size;
-+ unsigned char c, end;
-+
-+ p += p[-1] + 2;
-+ size = EXTRACT_UNSIGNED (&p[-2]);
-+ for (j = 0; j < size; j++)
-+ /* set bits for 1st bytes of multi-byte chars. */
-+ for (c = (unsigned char) p[j*4],
-+ end = (unsigned char) p[j*4 + 2];
-+ c <= end; c++)
-+ /* NOTE: Charset for multi-byte chars might contain
-+ single-byte chars. We must reject them. */
-+ if (ismbchar (c))
-+ fastmap[c] = 1;
-+ }
- break;
-
-
- case charset_not:
-+ /* S: set of all single-byte chars.
-+ M: set of all first bytes that can start multi-byte chars.
-+ s: any set of single-byte chars.
-+ m: any set of first bytes that can start multi-byte chars.
-+
-+ We assume S+M = U.
-+ ___ _ _
-+ s+m = (S*s+M*m). */
- /* Chars beyond end of map must be allowed. */
-+ /* NOTE: Charset_not for single-byte chars might contain
-+ multi-byte chars. See set_list_bits(). */
- for (j = *p * BYTEWIDTH; j < (1 << BYTEWIDTH); j++)
-- fastmap[j] = 1;
-+ if (!ismbchar (j))
-+ fastmap[j] = 1;
-
- for (j = *p++ * BYTEWIDTH - 1; j >= 0; j--)
- if (!(p[j / BYTEWIDTH] & (1 << (j % BYTEWIDTH))))
-- fastmap[j] = 1;
-+ if (!ismbchar (j))
-+ fastmap[j] = 1;
-+ {
-+ unsigned short size;
-+ unsigned short c, beg;
-+
-+ p += p[-1] + 2;
-+ size = EXTRACT_UNSIGNED (&p[-2]);
-+ c = 0x00;
-+ for (j = 0; j < size; j++) {
-+ for (beg = (unsigned char) p[j*4 + 0]; c <= beg; c++)
-+ if (ismbchar (c))
-+ fastmap[c] = 1;
-+ c = (unsigned char) p[j*4 + 2];
-+ }
-+ for (beg = 0xff; c <= beg; c++)
-+ if (ismbchar (c))
-+ fastmap[c] = 1;
-+ }
- break;
-
-@@ -2964,4 +3306,5 @@
- register int lim = 0;
- int irange = range;
-+ unsigned char c;
-
- if (startpos < size1 && startpos + range >= size1)
-@@ -2973,11 +3316,23 @@
- inside the loop. */
- if (translate)
-- while (range > lim
-- && !fastmap[(unsigned char)
-- translate[(unsigned char) *d++]])
-+ while (range > lim) {
-+ c = *d++;
-+ if (ismbchar (c)) {
-+ if (fastmap[c])
-+ break;
-+ d++;
-+ range -= 2;
-+ continue;
-+ }
-+ if (fastmap[(unsigned char) translate[c]])
-+ break;
- range--;
-+ }
- else
-- while (range > lim && !fastmap[(unsigned char) *d++])
-+ while (range > lim && (c = *d++, !fastmap[c])) {
-+ if (ismbchar (c))
-+ d++, range--;
- range--;
-+ }
-
- startpos += irange - range;
-@@ -3012,11 +3367,34 @@
- else if (range > 0)
- {
-- range--;
-- startpos++;
-+ const char *d = ((startpos >= size1 ? string2 - size1 : string1)
-+ + startpos);
-+
-+ if (ismbchar (*d)) {
-+ range--, startpos++;
-+ if (!range)
-+ break;
-+ }
-+ range--, startpos++;
- }
- else
- {
-- range++;
-- startpos--;
-+ range++, startpos--;
-+ {
-+ const char *s, *d, *p;
-+
-+ if (startpos < size1)
-+ s = string1, d = string1 + startpos;
-+ else
-+ s = string2, d = string2 + startpos - size1;
-+ for (p = d; p-- > s && ismbchar(*p); )
-+ /* --p >= s $B$@$H(B 80[12]?86 $B$GF0$+$J$$2DG=@-$,$"$k(B. (huge
-+ model $B0J30$G(B, s $B$N%*%U%;%C%H$,(B 0 $B$@$C$?>l9g(B.) */
-+ ;
-+ if (!((d - p) & 1)) {
-+ if (!range)
-+ break;
-+ range++, startpos--;
-+ }
-+ }
- }
- }
-@@ -3578,6 +3956,19 @@
- do
- {
-+ unsigned char c;
-+
- PREFETCH ();
-- if (translate[(unsigned char) *d++] != (char) *p++)
-+ c = *d++;
-+ if (ismbchar (c)) {
-+ if (c != (unsigned char) *p++
-+ || !--mcnt /* $B%Q%?!<%s$,@5$7$/%3%s%Q%$%k$5(B
-+ $B$l$F$$$k8B$j(B, $B$3$N%A%'%C%/$O(B
-+ $B>iD9$@$,G0$N$?$a(B. */
-+ || d == dend
-+ || (unsigned char) *d++ != (unsigned char) *p++)
-+ goto fail;
-+ continue;
-+ }
-+ if ((unsigned char) translate[c] != (unsigned char) *p++)
- goto fail;
- }
-@@ -3588,6 +3979,26 @@
- do
- {
-+#if 0
-+ /* $BB>$NItJ,$G$O(B, string1 $B$H(B string2 $B$K%^%k%A%P%$%HJ8;z(B
-+ $B$,8Y$k$N$r5v$7$F$$$J$$(B. $B$3$N$3$H$rB.EY$r5>@7$K$7$F(B
-+ $B$b%A%'%C%/$9$k>l9g$O(B, $B$3$3$H<!$N(B `#if 0' $B$r(B `#if 1'
-+ $B$KJQ$($k$3$H(B. */
-+ unsigned char c;
-+
-+#endif
- PREFETCH ();
-+#if 0
-+ c = *d++;
-+ if (ismbchar (c)) {
-+ if (c != (unsigned char) *p++
-+ || !--mcnt
-+ || d == dend)
-+ goto fail;
-+ c = *d++;
-+ }
-+ if (c != (unsigned char) *p++) goto fail;
-+#else
- if (*d++ != (char) *p++) goto fail;
-+#endif
- }
- while (--mcnt);
-@@ -3602,4 +4013,14 @@
-
- PREFETCH ();
-+ if (ismbchar (*d)) {
-+ if (d + 1 == dend || d[1] == '\n' || d[1] == '\0')
-+ /* $BL58z$J%^%k%A%P%$%HJ8;z$K$O%^%C%A$5$;$J$$(B. $B$3$3$G$O(B, $B4J(B
-+ $BC1$N$?$a#2%P%$%HL\$,(B '\n', '\0' $B$N$b$N$@$1$rL58z$H$9$k(B. */
-+ goto fail;
-+ SET_REGS_MATCHED ();
-+ DEBUG_PRINT2 (" Matched `%d'.\n", EXTRACT_MBC (&d[0]));
-+ d += 2;
-+ break;
-+ }
-
- if ((!(bufp->syntax & RE_DOT_NEWLINE) && TRANSLATE (*d) == '\n')
-@@ -3616,19 +4037,23 @@
- case charset_not:
- {
-- register unsigned char c;
-- boolean not = (re_opcode_t) *(p - 1) == charset_not;
-+ register unsigned short c;
-+ boolean not;
-
-- DEBUG_PRINT2 ("EXECUTING charset%s.\n", not ? "_not" : "");
-+ DEBUG_PRINT2 ("EXECUTING charset%s.\n",
-+ (re_opcode_t) *(p - 1) == charset_not ? "_not" : "");
-
- PREFETCH ();
-- c = TRANSLATE (*d); /* The character to match. */
-+ c = (unsigned char) *d;
-+ if (ismbchar (c)) {
-+ c <<= 8;
-+ if (d + 1 != dend)
-+ c |= (unsigned char) d[1];
-+ }
-+ else
-+ c = TRANSLATE (c); /* The character to match. */
-
-- /* Cast to `unsigned' instead of `unsigned char' in case the
-- bit list is a full 32 bytes long. */
-- if (c < (unsigned) (*p * BYTEWIDTH)
-- && p[1 + c / BYTEWIDTH] & (1 << (c % BYTEWIDTH)))
-- not = !not;
-+ not = is_in_list (c, p);
-
-- p += 1 + *p;
-+ p += 1 + *p + 2 + EXTRACT_UNSIGNED (&p[1 + *p])*4;
-
- if (!not) goto fail;
-@@ -3636,4 +4061,6 @@
- SET_REGS_MATCHED ();
- d++;
-+ if (d != dend && c >= 1 << BYTEWIDTH)
-+ d++;
- break;
- }
-@@ -3801,5 +4228,5 @@
-
- /* xx why this test? */
-- if ((int) old_regend[r] >= (int) regstart[r])
-+ if (old_regend[r] >= regstart[r])
- regend[r] = old_regend[r];
- }
-@@ -4052,5 +4479,5 @@
- || (bufp->newline_anchor && (re_opcode_t) *p2 == endline))
- {
-- register unsigned char c
-+ register unsigned short c
- = *p2 == (unsigned char) endline ? '\n' : p2[2];
- p1 = p + mcnt;
-@@ -4069,13 +4496,10 @@
- || (re_opcode_t) p1[3] == charset_not)
- {
-- int not = (re_opcode_t) p1[3] == charset_not;
--
-- if (c < (unsigned char) (p1[4] * BYTEWIDTH)
-- && p1[5 + c / BYTEWIDTH] & (1 << (c % BYTEWIDTH)))
-- not = !not;
-+ if (ismbchar (c))
-+ c = c << 8 | p2[3];
-
-- /* `not' is equal to 1 if c would match, which means
-+ /* `is_in_list()' is TRUE if c would match, which means
- that we can't change to pop_failure_jump. */
-- if (!not)
-+ if (!is_in_list (c, p1 + 4))
- {
- p[-3] = (unsigned char) pop_failure_jump;
-@@ -4632,8 +5056,15 @@
- char *translate;
- {
-- register unsigned char *p1 = s1, *p2 = s2;
-+ register unsigned char *p1 = s1, *p2 = s2, c;
- while (len)
- {
-- if (translate[*p1++] != translate[*p2++]) return 1;
-+ c = *p1++;
-+ if (ismbchar(c)) {
-+ if (c != *p2++ || !--len || *p1++ != *p2++)
-+ return 1;
-+ }
-+ else
-+ if (translate[c] != translate[*p2++])
-+ return 1;
- len--;
- }
-@@ -4778,5 +5209,5 @@
- {
- reg_errcode_t ret;
-- unsigned syntax
-+ reg_syntax_t syntax
- = (cflags & REG_EXTENDED) ?
- RE_SYNTAX_POSIX_EXTENDED : RE_SYNTAX_POSIX_BASIC;
-diff -ru2N grep-2.0/regex.h grep+mb1.04/regex.h
---- grep-2.0/regex.h Fri May 21 14:11:43 1993
-+++ grep+mb1.04/regex.h Sat Jul 10 04:38:03 1993
-@@ -17,4 +17,6 @@
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
-+/* Multi-byte extension added May, 1993 by t^2 (Takahiro Tanimoto)
-+ Last change: Jul. 10, 1993 by t^2 */
-
- #ifndef __REGEXP_LIBRARY_H__
-@@ -36,9 +38,9 @@
- the definitions shifted by one from the previous bit; thus, when we
- add or remove a bit, only one other definition need change. */
--typedef unsigned reg_syntax_t;
-+typedef unsigned long reg_syntax_t;
-
- /* If this bit is not set, then \ inside a bracket expression is literal.
- If set, then such a \ quotes the following character. */
--#define RE_BACKSLASH_ESCAPE_IN_LISTS (1)
-+#define RE_BACKSLASH_ESCAPE_IN_LISTS ((unsigned long)1)
-
- /* If this bit is not set, then + and ? are operators, and \+ and \? are
-@@ -206,5 +208,5 @@
- #undef RE_DUP_MAX
- #endif
--#define RE_DUP_MAX ((1 << 15) - 1)
-+#define RE_DUP_MAX ((int)(((unsigned)1 << 15) - 1))
-
-
-@@ -397,4 +399,10 @@
-
- #define _RE_ARGS(args) ()
-+
-+#ifdef __GNUC__
-+#define const __const__
-+#else
-+#define const
-+#endif
-
- #endif /* not __STDC__ */
-diff -ru2N grep-2.0/search.c grep+mb1.04/search.c
---- grep-2.0/search.c Mon May 3 06:02:00 1993
-+++ grep+mb1.04/search.c Fri Jul 9 14:55:21 1993
-@@ -17,4 +17,6 @@
-
- Written August 1992 by Mike Haertel. */
-+/* Multi-byte extension added Jul., 1993 by t^2 (Takahiro Tanimoto)
-+ Last change: Jul. 9, 1993 by t^2 */
-
- #include <ctype.h>
-@@ -61,4 +63,5 @@
- #include "kwset.h"
- #include "regex.h"
-+#include "mbc.h"
-
- #define NCHAR (UCHAR_MAX + 1)
-@@ -434,8 +437,9 @@
- char **endp;
- {
-- register char *beg, *try, *end;
-+ register char *beg, *try, *end, *p, *lim;
- register size_t len;
- struct kwsmatch kwsmatch;
-
-+ lim = buf;
- for (beg = buf; beg <= buf + size; ++beg)
- {
-@@ -456,4 +460,8 @@
- if (try > buf && WCHAR((unsigned char) try[-1]))
- break;
-+ for (p = try; p-- > lim && ismbchar(*p); )
-+ ;
-+ if (!((try - p) & 1))
-+ break;
- if (try + len < buf + size && WCHAR((unsigned char) try[len]))
- {
-@@ -464,6 +472,12 @@
- goto success;
- }
-- else
-- goto success;
-+ else {
-+ for (p = beg; p-- > lim && ismbchar(*p); )
-+ ;
-+ if ((beg - p) & 1)
-+ goto success;
-+ if (lim + 1 < beg)
-+ lim = beg - 1;
-+ }
- }
-
-diff -ru2N grep-2.0/tests/batgen.awk grep+mb1.04/tests/batgen.awk
---- grep-2.0/tests/batgen.awk Thu Jan 1 09:00:00 1970
-+++ grep+mb1.04/tests/batgen.awk Sat Jul 10 02:10:24 1993
-@@ -0,0 +1,10 @@
-+BEGIN { print "@echo off"; }
-+$0 !~ /^#/ && NF == 3 {
-+ printf "echo #%d --\n", ++n
-+ print "set R=0";
-+ print "echo " $3 ">tmp.in";
-+ print "grep -E -e \"" $2 "\" tmp.in >nul";
-+ print "if errorlevel 1 set R=1";
-+ print "if errorlevel 2 set R=2";
-+ printf "if not %R% == " $1 " echo Spencer test #%d failed\n", n
-+}
-diff -ru2N grep-2.0/tests/check.bat grep+mb1.04/tests/check.bat
---- grep-2.0/tests/check.bat Thu Jan 1 09:00:00 1970
-+++ grep+mb1.04/tests/check.bat Fri Jul 9 17:05:30 1993
-@@ -0,0 +1,14 @@
-+@echo off
-+rem
-+rem Regression test for GNU e?grep.
-+rem
-+
-+rem The Khadafy test is brought to you by Scott Anderson . . .
-+grep -E -f tests/khadafy.reg tests/khadafy.lin > khadafy.out
-+fc tests\khadafy.lin khadafy.out
-+
-+rem . . . and the following by Henry Spencer.
-+
-+gawk -F: -f tests/batgen.awk tests/spencer.dos > tmp.bat
-+
-+tmp
-diff -ru2N grep-2.0/tests/spencer.dos grep+mb1.04/tests/spencer.dos
---- grep-2.0/tests/spencer.dos Thu Jan 1 09:00:00 1970
-+++ grep+mb1.04/tests/spencer.dos Sat Jul 10 02:12:59 1993
-@@ -0,0 +1,122 @@
-+0:abc:abc
-+1:abc:xbc
-+1:abc:axc
-+1:abc:abx
-+0:abc:xabcy
-+0:abc:ababc
-+0:ab*c:abc
-+0:ab*bc:abc
-+0:ab*bc:abbc
-+0:ab*bc:abbbbc
-+0:ab+bc:abbc
-+1:ab+bc:abc
-+1:ab+bc:abq
-+0:ab+bc:abbbbc
-+0:ab?bc:abbc
-+0:ab?bc:abc
-+1:ab?bc:abbbbc
-+0:ab?c:abc
-+0:^abc$:abc
-+1:^abc$:abcc
-+0:^abc:abcc
-+1:^abc$:aabc
-+0:abc$:aabc
-+0:^:abc
-+0:$:abc
-+0:a.c:abc
-+0:a.c:axc
-+0:a.*c:axyzc
-+1:a.*c:axyzd
-+1:a[bc]d:abc
-+0:a[bc]d:abd
-+1:a[b-d]e:abd
-+0:a[b-d]e:ace
-+0:a[b-d]:aac
-+0:a[-b]:a-
-+0:a[b-]:a-
-+1:a[b-a]:-
-+2:a[]b:-
-+2:a[:-
-+0:a]:a]
-+0:a[]]b:a]b
-+0:a[^bc]d:aed
-+1:a[^bc]d:abd
-+0:a[^-b]c:adc
-+1:a[^-b]c:a-c
-+1:a[^]b]c:a]c
-+0:a[^]b]c:adc
-+0:ab|cd:abc
-+0:ab|cd:abcd
-+0:()ef:def
-+0:()*:-
-+1:*a:-
-+0:^*:-
-+0:$*:-
-+1:(*)b:-
-+1:$b:b
-+2:a\\:-
-+0:a\(b:a(b
-+0:a\(*b:ab
-+0:a\(*b:a((b
-+1:a\x:a\x
-+2:abc):-
-+2:(abc:-
-+0:((a)):abc
-+0:(a)b(c):abc
-+0:a+b+c:aabbabc
-+0:a**:-
-+0:a*?:-
-+0:(a*)*:-
-+0:(a*)+:-
-+0:(a|)*:-
-+0:(a*|b)*:-
-+0:(a+|b)*:ab
-+0:(a+|b)+:ab
-+0:(a+|b)?:ab
-+0:[^ab]*:cde
-+0:(^)*:-
-+0:(ab|)*:-
-+2:)(:-
-+1:abc:
-+1:abc:
-+0:a*:
-+0:([abc])*d:abbbcd
-+0:([abc])*bcd:abcd
-+0:a|b|c|d|e:e
-+0:(a|b|c|d|e)f:ef
-+0:((a*|b))*:-
-+0:abcd*efg:abcdefg
-+0:ab*:xabyabbbz
-+0:ab*:xayabbbz
-+0:(ab|cd)e:abcde
-+0:[abhgefdc]ij:hij
-+1:^(ab|cd)e:abcde
-+0:(abc|)ef:abcdef
-+0:(a|b)c*d:abcd
-+0:(ab|ab*)bc:abc
-+0:a([bc]*)c*:abc
-+0:a([bc]*)(c*d):abcd
-+0:a([bc]+)(c*d):abcd
-+0:a([bc]*)(c+d):abcd
-+0:a[bcd]*dcdcde:adcdcde
-+1:a[bcd]+dcdcde:adcdcde
-+0:(ab|a)b*c:abc
-+0:((a)(b)c)(d):abcd
-+0:[A-Za-z_][A-Za-z0-9_]*:alpha
-+0:^a(bc+|b[eh])g|.h$:abh
-+0:(bc+d$|ef*g.|h?i(j|k)):effgz
-+0:(bc+d$|ef*g.|h?i(j|k)):ij
-+1:(bc+d$|ef*g.|h?i(j|k)):effg
-+1:(bc+d$|ef*g.|h?i(j|k)):bcdd
-+0:(bc+d$|ef*g.|h?i(j|k)):reffgz
-+1:((((((((((a)))))))))):-
-+0:(((((((((a))))))))):a
-+1:multiple words of text:uh-uh
-+0:multiple words:multiple words, yeah
-+0:(.*)c(.*):abcde
-+1:\((.*),:(.*)\)
-+1:[k]:ab
-+0:abcd:abcd
-+0:a(bc)d:abcd
-+0:a[-]?c:ac
-+0:(....).*\1:beriberi
diff --git a/japanese/grep/patches/patch-ab b/japanese/grep/patches/patch-ab
deleted file mode 100644
index 50c0b223b18..00000000000
--- a/japanese/grep/patches/patch-ab
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ab,v 1.2 1999/06/08 09:27:27 sakamoto Exp $
-
---- grep-2.0/Makefile.in.orig Tue Apr 4 02:25:58 1995
-+++ grep-2.0/Makefile.in Tue Apr 4 02:27:57 1995
-@@ -74,7 +74,7 @@
- manext=1
-
- # How to make a hard link.
--LN=ln
-+LN=ln -s
-
- #### End of system configuration section. ####
-
-@@ -97,10 +97,10 @@
- install: all
- $(INSTALL_PROGRAM) grep $(bindir)/$(binprefix)grep
- rm -f $(bindir)/$(binprefix)egrep
-- $(LN) $(bindir)/$(binprefix)grep $(bindir)/$(binprefix)egrep
-+ cd $(bindir); $(LN) $(binprefix)grep $(binprefix)egrep
- rm -f $(bindir)/$(binprefix)fgrep
-- $(LN) $(bindir)/$(binprefix)grep $(bindir)/$(binprefix)fgrep
-+ cd $(bindir); $(LN) $(binprefix)grep $(binprefix)fgrep
- $(INSTALL_DATA) $(srcdir)/grep.man $(mandir)/grep.$(manext)
-
- check:
- AWK=$(AWK) sh $(srcdir)/tests/check.sh $(srcdir)/tests
diff --git a/japanese/grep/patches/patch-ac b/japanese/grep/patches/patch-ac
deleted file mode 100644
index c47dbd0d8ac..00000000000
--- a/japanese/grep/patches/patch-ac
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ac,v 1.1 1999/06/08 09:27:27 sakamoto Exp $
-
---- Makefile.in.orig Tue Jun 8 10:04:26 1999
-+++ Makefile.in Tue Jun 8 10:08:26 1999
-@@ -60,9 +60,9 @@
- exec_prefix=$(prefix)
-
- # Prefix for installed program, normally empty or `g'.
--binprefix=
-+binprefix=j
- # Prefix for installed man page, normally empty or `g'.
--manprefix=
-+manprefix=j
-
- # Where to install executables.
- bindir=$(exec_prefix)/bin
-@@ -100,7 +100,7 @@
- cd $(bindir); $(LN) $(binprefix)grep $(binprefix)egrep
- rm -f $(bindir)/$(binprefix)fgrep
- cd $(bindir); $(LN) $(binprefix)grep $(binprefix)fgrep
-- $(INSTALL_DATA) $(srcdir)/grep.man $(mandir)/grep.$(manext)
-+ $(INSTALL_DATA) $(srcdir)/grep.man $(mandir)/$(manprefix)grep.$(manext)
-
- check:
- AWK=$(AWK) sh $(srcdir)/tests/check.sh $(srcdir)/tests
diff --git a/japanese/groff/DESCR b/japanese/groff/DESCR
deleted file mode 100644
index f26a42fabf5..00000000000
--- a/japanese/groff/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-Jgroff is based on GNU groff formating system. It is enhanced to
-handle japanese EUC coding documents.
diff --git a/japanese/groff/Makefile b/japanese/groff/Makefile
deleted file mode 100644
index 94d8f803350..00000000000
--- a/japanese/groff/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2001/02/16 15:25:17 wiz Exp $
-# FreeBSD Id: Makefile,v 1.15 1999/01/27 07:41:16 fenner Exp $
-
-DISTNAME= groff-1.10
-PKGNAME= ja-groff-0.99
-CATEGORIES= japanese print
-MASTER_SITES= ${MASTER_SITE_GNU:=groff/}
-
-PATCH_SITES= ftp://ftp.ae.keio.ac.jp/pub/GNU/ \
- ftp://ftp.tohoku.ac.jp/pub/GNU/japanese/
-PATCHFILES= jgroff-0.99.diff.gz
-PATCH_DIST_STRIP= -p1
-
-MAINTAINER= sakamoto@netbsd.org
-HOMEPAGE= http://www.gnu.org/software/groff/groff.html
-COMMENT= Japanese enhancement of GNU groff
-
-USE_GMAKE= yes
-GNU_CONFIGURE= yes
-#CONFIGURE_ENV+= CXXFLAGS="-fno-rtti -fno-exceptions -O"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/japanese/groff/PLIST b/japanese/groff/PLIST
deleted file mode 100644
index a990fcf3730..00000000000
--- a/japanese/groff/PLIST
+++ /dev/null
@@ -1,328 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:29:11 zuntum Exp $
-bin/afmtodit
-bin/jaddftinfo
-bin/jgeqn
-bin/jgindxbib
-bin/jglookbib
-bin/jgneqn
-bin/jgnroff
-bin/jgpic
-bin/jgrefer
-bin/jgrodvi
-bin/jgroff
-bin/jgrog
-bin/jgrolj4
-bin/jgrops
-bin/jgrotty
-bin/jgsoelim
-bin/jgtbl
-bin/jgtroff
-bin/jhpftodit
-bin/jlkbib
-bin/jpfbtops
-bin/jpsbb
-bin/jtfmtodit
-man/man1/jaddftinfo.1
-man/man1/jafmtodit.1
-man/man1/jgeqn.1
-man/man1/jgindxbib.1
-man/man1/jglookbib.1
-man/man1/jgnroff.1
-man/man1/jgpic.1
-man/man1/jgrefer.1
-man/man1/jgrodvi.1
-man/man1/jgroff.1
-man/man1/jgrog.1
-man/man1/jgrolj4.1
-man/man1/jgrops.1
-man/man1/jgrotty.1
-man/man1/jgsoelim.1
-man/man1/jgtbl.1
-man/man1/jgtroff.1
-man/man1/jhpftodit.1
-man/man1/jlkbib.1
-man/man1/jpfbtops.1
-man/man1/jpsbb.1
-man/man1/jtfmtodit.1
-man/man5/groff_font.5
-man/man5/groff_out.5
-man/man7/groff_char.7
-man/man7/groff_mm.7
-man/man7/groff_mmse.7
-man/man7/groff_ms.7
-man/man7/me.7
-man/man7/msafer.7
-share/groff/eign
-share/groff/font/devX100-12/CB
-share/groff/font/devX100-12/CBI
-share/groff/font/devX100-12/CI
-share/groff/font/devX100-12/CR
-share/groff/font/devX100-12/DESC
-share/groff/font/devX100-12/G
-share/groff/font/devX100-12/HB
-share/groff/font/devX100-12/HBI
-share/groff/font/devX100-12/HI
-share/groff/font/devX100-12/HR
-share/groff/font/devX100-12/M
-share/groff/font/devX100-12/NB
-share/groff/font/devX100-12/NBI
-share/groff/font/devX100-12/NI
-share/groff/font/devX100-12/NR
-share/groff/font/devX100-12/S
-share/groff/font/devX100-12/TB
-share/groff/font/devX100-12/TBI
-share/groff/font/devX100-12/TI
-share/groff/font/devX100-12/TR
-share/groff/font/devX100/CB
-share/groff/font/devX100/CBI
-share/groff/font/devX100/CI
-share/groff/font/devX100/CR
-share/groff/font/devX100/DESC
-share/groff/font/devX100/G
-share/groff/font/devX100/HB
-share/groff/font/devX100/HBI
-share/groff/font/devX100/HI
-share/groff/font/devX100/HR
-share/groff/font/devX100/M
-share/groff/font/devX100/NB
-share/groff/font/devX100/NBI
-share/groff/font/devX100/NI
-share/groff/font/devX100/NR
-share/groff/font/devX100/S
-share/groff/font/devX100/TB
-share/groff/font/devX100/TBI
-share/groff/font/devX100/TI
-share/groff/font/devX100/TR
-share/groff/font/devX75-12/CB
-share/groff/font/devX75-12/CBI
-share/groff/font/devX75-12/CI
-share/groff/font/devX75-12/CR
-share/groff/font/devX75-12/DESC
-share/groff/font/devX75-12/G
-share/groff/font/devX75-12/HB
-share/groff/font/devX75-12/HBI
-share/groff/font/devX75-12/HI
-share/groff/font/devX75-12/HR
-share/groff/font/devX75-12/M
-share/groff/font/devX75-12/NB
-share/groff/font/devX75-12/NBI
-share/groff/font/devX75-12/NI
-share/groff/font/devX75-12/NR
-share/groff/font/devX75-12/S
-share/groff/font/devX75-12/TB
-share/groff/font/devX75-12/TBI
-share/groff/font/devX75-12/TI
-share/groff/font/devX75-12/TR
-share/groff/font/devX75/CB
-share/groff/font/devX75/CBI
-share/groff/font/devX75/CI
-share/groff/font/devX75/CR
-share/groff/font/devX75/DESC
-share/groff/font/devX75/G
-share/groff/font/devX75/HB
-share/groff/font/devX75/HBI
-share/groff/font/devX75/HI
-share/groff/font/devX75/HR
-share/groff/font/devX75/M
-share/groff/font/devX75/NB
-share/groff/font/devX75/NBI
-share/groff/font/devX75/NI
-share/groff/font/devX75/NR
-share/groff/font/devX75/S
-share/groff/font/devX75/TB
-share/groff/font/devX75/TBI
-share/groff/font/devX75/TI
-share/groff/font/devX75/TR
-share/groff/font/devascii/B
-share/groff/font/devascii/BI
-share/groff/font/devascii/DESC
-share/groff/font/devascii/I
-share/groff/font/devascii/R
-share/groff/font/devdvi/B
-share/groff/font/devdvi/BI
-share/groff/font/devdvi/CW
-share/groff/font/devdvi/DESC
-share/groff/font/devdvi/EX
-share/groff/font/devdvi/G
-share/groff/font/devdvi/H
-share/groff/font/devdvi/HB
-share/groff/font/devdvi/HI
-share/groff/font/devdvi/I
-share/groff/font/devdvi/M
-share/groff/font/devdvi/MI
-share/groff/font/devdvi/R
-share/groff/font/devdvi/S
-share/groff/font/devdvi/SA
-share/groff/font/devdvi/SB
-share/groff/font/devdvi/generate/CompileFonts
-share/groff/font/devdvi/generate/Makefile
-share/groff/font/devdvi/generate/msam.map
-share/groff/font/devdvi/generate/msbm.map
-share/groff/font/devdvi/generate/texb.map
-share/groff/font/devdvi/generate/texex.map
-share/groff/font/devdvi/generate/texi.map
-share/groff/font/devdvi/generate/texmi.map
-share/groff/font/devdvi/generate/texr.map
-share/groff/font/devdvi/generate/texsy.map
-share/groff/font/devdvi/generate/textt.map
-share/groff/font/devlatin1/B
-share/groff/font/devlatin1/BI
-share/groff/font/devlatin1/DESC
-share/groff/font/devlatin1/I
-share/groff/font/devlatin1/R
-share/groff/font/devlj4/ALBB
-share/groff/font/devlj4/ALBR
-share/groff/font/devlj4/AOB
-share/groff/font/devlj4/AOI
-share/groff/font/devlj4/AOR
-share/groff/font/devlj4/CB
-share/groff/font/devlj4/CBI
-share/groff/font/devlj4/CI
-share/groff/font/devlj4/CLARENDON
-share/groff/font/devlj4/CORONET
-share/groff/font/devlj4/CR
-share/groff/font/devlj4/DESC
-share/groff/font/devlj4/GB
-share/groff/font/devlj4/GBI
-share/groff/font/devlj4/GI
-share/groff/font/devlj4/GR
-share/groff/font/devlj4/LGB
-share/groff/font/devlj4/LGI
-share/groff/font/devlj4/LGR
-share/groff/font/devlj4/MARIGOLD
-share/groff/font/devlj4/OB
-share/groff/font/devlj4/OBI
-share/groff/font/devlj4/OI
-share/groff/font/devlj4/OR
-share/groff/font/devlj4/S
-share/groff/font/devlj4/TB
-share/groff/font/devlj4/TBI
-share/groff/font/devlj4/TI
-share/groff/font/devlj4/TR
-share/groff/font/devlj4/UB
-share/groff/font/devlj4/UBI
-share/groff/font/devlj4/UCB
-share/groff/font/devlj4/UCBI
-share/groff/font/devlj4/UCI
-share/groff/font/devlj4/UCR
-share/groff/font/devlj4/UI
-share/groff/font/devlj4/UR
-share/groff/font/devlj4/generate/Makefile
-share/groff/font/devlj4/generate/special.map
-share/groff/font/devlj4/generate/text.map
-share/groff/font/devnippon/B
-share/groff/font/devnippon/BI
-share/groff/font/devnippon/DESC
-share/groff/font/devnippon/G
-share/groff/font/devnippon/I
-share/groff/font/devnippon/M
-share/groff/font/devnippon/R
-share/groff/font/devps/AB
-share/groff/font/devps/ABI
-share/groff/font/devps/AI
-share/groff/font/devps/AR
-share/groff/font/devps/BMB
-share/groff/font/devps/BMBI
-share/groff/font/devps/BMI
-share/groff/font/devps/BMR
-share/groff/font/devps/CB
-share/groff/font/devps/CBI
-share/groff/font/devps/CI
-share/groff/font/devps/CR
-share/groff/font/devps/DESC
-share/groff/font/devps/G
-share/groff/font/devps/HB
-share/groff/font/devps/HBI
-share/groff/font/devps/HI
-share/groff/font/devps/HNB
-share/groff/font/devps/HNBI
-share/groff/font/devps/HNI
-share/groff/font/devps/HNR
-share/groff/font/devps/HR
-share/groff/font/devps/M
-share/groff/font/devps/NB
-share/groff/font/devps/NBI
-share/groff/font/devps/NI
-share/groff/font/devps/NR
-share/groff/font/devps/PB
-share/groff/font/devps/PBI
-share/groff/font/devps/PI
-share/groff/font/devps/PR
-share/groff/font/devps/S
-share/groff/font/devps/SS
-share/groff/font/devps/TB
-share/groff/font/devps/TBI
-share/groff/font/devps/TI
-share/groff/font/devps/TR
-share/groff/font/devps/ZCMI
-share/groff/font/devps/ZD
-share/groff/font/devps/ZDR
-share/groff/font/devps/download
-share/groff/font/devps/generate/Makefile
-share/groff/font/devps/generate/afmname
-share/groff/font/devps/generate/dingbatsmap
-share/groff/font/devps/generate/dingbatsrmap
-share/groff/font/devps/generate/lgreekmap
-share/groff/font/devps/generate/symbol.sed
-share/groff/font/devps/generate/symbolchars
-share/groff/font/devps/generate/symbolsl.afm
-share/groff/font/devps/generate/textmap
-share/groff/font/devps/prologue
-share/groff/font/devps/symbolsl.pfa
-share/groff/font/devps/text.enc
-share/groff/font/devps/zapfdr.pfa
-share/groff/tmac/eqnrc
-share/groff/tmac/hyphen.us
-share/groff/tmac/man.local
-share/groff/tmac/mdoc/doc-common
-share/groff/tmac/mdoc/doc-ditroff
-share/groff/tmac/mdoc/doc-nroff
-share/groff/tmac/mdoc/doc-syms
-share/groff/tmac/mm/0.MT
-share/groff/tmac/mm/4.MT
-share/groff/tmac/mm/5.MT
-share/groff/tmac/mm/locale
-share/groff/tmac/mm/ms.cov
-share/groff/tmac/mm/se_locale
-share/groff/tmac/mm/se_ms.cov
-share/groff/tmac/tmac.X
-share/groff/tmac/tmac.Xps
-share/groff/tmac/tmac.an
-share/groff/tmac/tmac.andoc
-share/groff/tmac/tmac.doc
-share/groff/tmac/tmac.doc.old
-share/groff/tmac/tmac.dvi
-share/groff/tmac/tmac.e
-share/groff/tmac/tmac.latin1
-share/groff/tmac/tmac.lj4
-share/groff/tmac/tmac.m
-share/groff/tmac/tmac.mse
-share/groff/tmac/tmac.pic
-share/groff/tmac/tmac.ps
-share/groff/tmac/tmac.psatk
-share/groff/tmac/tmac.psnew
-share/groff/tmac/tmac.psold
-share/groff/tmac/tmac.pspic
-share/groff/tmac/tmac.s
-share/groff/tmac/tmac.safer
-share/groff/tmac/tmac.tty
-share/groff/tmac/tmac.tty-char
-share/groff/tmac/troffrc
-@dirrm share/groff/tmac/mm
-@dirrm share/groff/tmac/mdoc
-@dirrm share/groff/tmac
-@dirrm share/groff/font/devps/generate
-@dirrm share/groff/font/devps
-@dirrm share/groff/font/devnippon
-@dirrm share/groff/font/devlj4/generate
-@dirrm share/groff/font/devlj4
-@dirrm share/groff/font/devlatin1
-@dirrm share/groff/font/devdvi/generate
-@dirrm share/groff/font/devdvi
-@dirrm share/groff/font/devascii
-@dirrm share/groff/font/devX75-12
-@dirrm share/groff/font/devX75
-@dirrm share/groff/font/devX100-12
-@dirrm share/groff/font/devX100
-@dirrm share/groff/font
-@dirrm share/groff
diff --git a/japanese/groff/distinfo b/japanese/groff/distinfo
deleted file mode 100644
index 68f34786928..00000000000
--- a/japanese/groff/distinfo
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: distinfo,v 1.3 2001/12/17 19:17:46 wiz Exp $
-
-SHA1 (groff-1.10.tar.gz) = 032eeb221aff1a621019374646819e8741c11d39
-Size (groff-1.10.tar.gz) = 986431 bytes
-SHA1 (jgroff-0.99.diff.gz) = e030248125b7adc8806077bd2027386978631f48
-Size (jgroff-0.99.diff.gz) = 84778 bytes
-SHA1 (patch-aa) = 221047d658720f939c99509defea8cd8d628c489
-SHA1 (patch-ab) = edcf06b85d0ae9861905ad8b0cf36856e78c2c8f
-SHA1 (patch-ac) = fb2f711205c3856d819c3dafe4f58eeea5433c29
-SHA1 (patch-ad) = 8e87b782b582c675606286fc29b1bbfcb8a4b09d
-SHA1 (patch-ae) = b7c0ba9d485c6ceebce19e44a92d354cd770fff0
-SHA1 (patch-af) = 8de7a41489471d387a264f1677959ee99f569929
-SHA1 (patch-ag) = 7943286207679123f302d5ccb1a4bd7e0eb5571c
-SHA1 (patch-ah) = 6bcf32bc8441a0d5182cabe8d811f696678dc144
-SHA1 (patch-ai) = 4bfc39d00cc63ed0de02489ce45d01e49563871e
-SHA1 (patch-aj) = 70ec56a901457c6534c77bd1c67e6c2d6f7b7cd3
-SHA1 (patch-ak) = 2cd8539d364edee3f305bb49c5b2518735e76666
-SHA1 (patch-al) = 63c383ec386657aff1d84e01dee1843d7f94109b
diff --git a/japanese/groff/patches/patch-aa b/japanese/groff/patches/patch-aa
deleted file mode 100644
index 78a033eda78..00000000000
--- a/japanese/groff/patches/patch-aa
+++ /dev/null
@@ -1,56 +0,0 @@
-$NetBSD: patch-aa,v 1.2 1999/06/08 09:35:20 sakamoto Exp $
---- afmtodit/Makefile.sub.orig Wed Oct 28 21:48:22 1992
-+++ afmtodit/Makefile.sub Tue Mar 26 22:38:08 1996
-@@ -15,7 +15,7 @@
- install_data: afmtodit
- -test -d $(bindir) || mkdir $(bindir)
- -rm -f $(bindir)/afmtodit
-- $(INSTALL_PROGRAM) afmtodit $(bindir)/afmtodit
-+ $(INSTALL) -m 555 afmtodit $(bindir)/afmtodit
-
- uninstall_sub:
- -rm -f $(bindir)/afmtodit
---- eqn/Makefile.sub.orig Mon Apr 19 17:47:10 1993
-+++ eqn/Makefile.sub Tue Mar 26 22:39:26 1996
-@@ -21,7 +21,7 @@
-
- install_data: neqn
- -rm -f $(bindir)/$(NAMEPREFIX)neqn
-- $(INSTALL_PROGRAM) neqn $(bindir)/$(NAMEPREFIX)neqn
-+ $(INSTALL) -m 555 neqn $(bindir)/$(NAMEPREFIX)neqn
-
- uninstall_sub:
- -rm -f $(bindir)/$(NAMEPREFIX)neqn
---- grog/Makefile.sub.orig Mon Apr 19 17:47:11 1993
-+++ grog/Makefile.sub Tue Mar 26 22:39:45 1996
-@@ -16,7 +16,7 @@
- install_data: grog
- -test -d $(bindir) || mkdir $(bindir)
- -rm -f $(bindir)/grog
-- $(INSTALL_PROGRAM) grog $(bindir)/grog
-+ $(INSTALL) -m 555 grog $(bindir)/$(NAMEPREFIX)grog
-
- uninstall_sub:
- -rm -f $(bindir)/grog
---- nroff/Makefile.sub.orig Mon Apr 19 17:46:21 1993
-+++ nroff/Makefile.sub Tue Mar 26 22:40:10 1996
-@@ -11,7 +11,7 @@
-
- install_data: nroff
- -rm -f $(bindir)/$(NAMEPREFIX)nroff
-- $(INSTALL_PROGRAM) nroff $(bindir)/$(NAMEPREFIX)nroff
-+ $(INSTALL) -m 555 nroff $(bindir)/$(NAMEPREFIX)nroff
-
- uninstall_sub:
- -rm -f $(bindir)/$(NAMEPREFIX)nroff
---- configure.orig Mon Nov 20 20:36:05 1995
-+++ configure Sat Mar 30 00:54:44 1996
-@@ -1904,7 +1904,7 @@
- g=g
- else
- echo "$ac_t""no" 1>&6
-- g=
-+ g=jg
- fi
-
-
diff --git a/japanese/groff/patches/patch-ab b/japanese/groff/patches/patch-ab
deleted file mode 100644
index 99ff3508cca..00000000000
--- a/japanese/groff/patches/patch-ab
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-ab,v 1.1 1999/06/08 09:35:20 sakamoto Exp $
---- Makefile.in.orig Fri May 28 16:26:33 1999
-+++ Makefile.in Fri May 28 16:34:14 1999
-@@ -175,7 +175,21 @@
- # -DHAVE_STRUCT_EXCEPTION if <math.h> defines struct exception
- # -DRETSIGTYPE=int if signal handlers return int not void
- # -DNIPPON enable japanese extention
--DEFINES=@DEFS@
-+DEFINES= -DHAVE_UNISTD_H=1 \
-+ -DHAVE_DIRENT_H=1 \
-+ -DHAVE_LIMITS_H=1 \
-+ -DHAVE_STDLIB_H=1 \
-+ -DHAVE_SYS_DIR_H=1 \
-+ -DHAVE_CC_LIMITS_H=1 \
-+ -DHAVE_CC_UNISTD_H=1 \
-+ -DUNISTD_H_DECLARES_GETOPT=1 \
-+ -DSTDLIB_H_DECLARES_PUTENV=1 \
-+ -DRETSIGTYPE=void \
-+ -DHAVE_MMAP=1 \
-+ -DHAVE_RENAME=1 \
-+ -DHAVE_MKSTEMP=1 \
-+ -DHAVE_SYS_SIGLIST=1 \
-+ -DNIPPON=1
-
- # Include fmod.o, strtol.o, getcwd.o, strerror.o, putenv.o in LIBOBJS if
- # your C library is missing the corresponding function.
-@@ -240,6 +254,7 @@
- "CCFLAGS=$(CCFLAGS)" "CFLAGS=$(CFLAGS)" "LDFLAGS=$(LDFLAGS)" \
- "YACC=$(YACC)" "YACCFLAGS=$(YACCFLAGS)" \
- "LIBS=$(LIBS)" "LIBOBJS=$(LIBOBJS)" "RANLIB=$(RANLIB)" "AR=$(AR)" \
-+ "INSTALL=$(INSTALL)" \
- "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" "INSTALL_DATA=$(INSTALL_DATA)" \
- "ETAGS=$(ETAGS)" "ETAGSFLAGS=$(ETAGSFLAGS)" "ETAGSCCFLAG=$(ETAGSCCFLAG)" \
- "PERLPATH=$(PERLPATH)" "SH_SCRIPT_SED_CMD=$(SH_SCRIPT_SED_CMD)" \
diff --git a/japanese/groff/patches/patch-ac b/japanese/groff/patches/patch-ac
deleted file mode 100644
index 48cb8fa26d6..00000000000
--- a/japanese/groff/patches/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ac,v 1.2 1999/06/08 09:35:21 sakamoto Exp $
---- troff/env.cc.orig Fri May 28 14:52:15 1999
-+++ troff/env.cc Fri May 28 15:00:12 1999
-@@ -765,7 +765,6 @@
- #endif /* WIDOW_CONTROL */
- hyphen_line_max(e->hyphen_line_max),
- hyphen_line_count(0),
-- met_with_kword_space(0),
- hyphenation_space(e->hyphenation_space),
- hyphenation_margin(e->hyphenation_margin),
- composite(0)
diff --git a/japanese/groff/patches/patch-ad b/japanese/groff/patches/patch-ad
deleted file mode 100644
index b7dfad96f2e..00000000000
--- a/japanese/groff/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.1 1999/06/08 09:35:21 sakamoto Exp $
---- Makefile.comm.orig Tue Jun 27 20:08:27 1995
-+++ Makefile.comm Fri May 28 16:10:13 1999
-@@ -44,7 +44,7 @@
- CLEANFILES=$(LIBCLEAN)
- DISTCLEANFILES=TAGS Makefile
- REALCLEANFILES=$(YTABC) $(YTABH)
--NAMEPREFIX=
-+NAMEPREFIX=j
- HDRS=
- MANPAGES=$(MAN1) $(MAN5) $(MAN7)
- MANCLEAN=$(MANPAGES)
diff --git a/japanese/groff/patches/patch-ae b/japanese/groff/patches/patch-ae
deleted file mode 100644
index 06044e4bc85..00000000000
--- a/japanese/groff/patches/patch-ae
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: patch-ae,v 1.1 1999/06/08 09:35:21 sakamoto Exp $
---- nroff/nroff.sh.orig Fri May 28 17:03:23 1999
-+++ nroff/nroff.sh Fri May 28 18:24:04 1999
-@@ -58,4 +58,4 @@
-
- # This shell script is intended for use with man, so warnings are
- # probably not wanted. Also load nroff-style character definitions.
--exec groff -Wall -mtty-char $T $opts ${1+"$@"}
-+exec jgroff -Wall -mtty-char $T $opts ${1+"$@"}
diff --git a/japanese/groff/patches/patch-af b/japanese/groff/patches/patch-af
deleted file mode 100644
index c48a38c7291..00000000000
--- a/japanese/groff/patches/patch-af
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: patch-af,v 1.1 1999/06/08 09:35:21 sakamoto Exp $
---- devascii/DESC.proto.orig Wed Jul 29 22:32:04 1992
-+++ devascii/DESC.proto Mon May 31 14:38:42 1999
-@@ -5,4 +5,4 @@
- sizes 10 0
- fonts 4 R I B BI
- tcommand
--postpro grotty
-+postpro jgrotty
diff --git a/japanese/groff/patches/patch-ag b/japanese/groff/patches/patch-ag
deleted file mode 100644
index cfe270f00af..00000000000
--- a/japanese/groff/patches/patch-ag
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: patch-ag,v 1.1 1999/06/08 09:35:21 sakamoto Exp $
---- devdvi/DESC.in.orig Mon May 31 13:36:28 1999
-+++ devdvi/DESC.in Mon May 31 14:38:55 1999
-@@ -8,4 +8,4 @@
- fonts 15 R I B BI 0 0 0 0 0 MI S EX CW M G
- ondemand M G
- tcommand
--postpro grodvi
-+postpro jgrodvi
diff --git a/japanese/groff/patches/patch-ah b/japanese/groff/patches/patch-ah
deleted file mode 100644
index 82904caa5a7..00000000000
--- a/japanese/groff/patches/patch-ah
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: patch-ah,v 1.1 1999/06/08 09:35:21 sakamoto Exp $
---- devlatin1/DESC.proto.orig Wed Jul 29 22:32:26 1992
-+++ devlatin1/DESC.proto Mon May 31 14:39:13 1999
-@@ -5,4 +5,4 @@
- sizes 10 0
- fonts 4 R I B BI
- tcommand
--postpro grotty
-+postpro jgrotty
diff --git a/japanese/groff/patches/patch-ai b/japanese/groff/patches/patch-ai
deleted file mode 100644
index e37ef85f6a3..00000000000
--- a/japanese/groff/patches/patch-ai
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: patch-ai,v 1.1 1999/06/08 09:35:21 sakamoto Exp $
---- devlj4/DESC.in.orig Wed Jul 6 22:10:25 1994
-+++ devlj4/DESC.in Mon May 31 14:39:27 1999
-@@ -6,4 +6,4 @@
- fonts 6 0 0 0 0 0 S
- family T
- tcommand
--postpro grolj4
-+postpro jgrolj4
diff --git a/japanese/groff/patches/patch-aj b/japanese/groff/patches/patch-aj
deleted file mode 100644
index 6ffb62912c2..00000000000
--- a/japanese/groff/patches/patch-aj
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: patch-aj,v 1.1 1999/06/08 09:35:21 sakamoto Exp $
---- devnippon/DESC.proto.orig Mon May 31 13:36:29 1999
-+++ devnippon/DESC.proto Mon May 31 14:39:40 1999
-@@ -6,4 +6,4 @@
- fonts 6 R I B BI M G
- ondemand M G
- tcommand
--postpro grotty
-+postpro jgrotty
diff --git a/japanese/groff/patches/patch-ak b/japanese/groff/patches/patch-ak
deleted file mode 100644
index 65fed262bde..00000000000
--- a/japanese/groff/patches/patch-ak
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: patch-ak,v 1.1 1999/06/08 09:35:21 sakamoto Exp $
---- devps/DESC.in.orig Mon May 31 13:36:29 1999
-+++ devps/DESC.in Mon May 31 14:39:52 1999
-@@ -11,4 +11,4 @@
- fonts 11 0 0 0 0 0 SS S ZD ZDR M G
- ondemand M G
- tcommand
--postpro grops
-+postpro jgrops
diff --git a/japanese/groff/patches/patch-al b/japanese/groff/patches/patch-al
deleted file mode 100644
index c926ca9e983..00000000000
--- a/japanese/groff/patches/patch-al
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-al,v 1.1 2001/12/17 19:17:48 wiz Exp $
-
---- include/lib.h.orig Thu Jun 22 09:41:29 1995
-+++ include/lib.h
-@@ -51,6 +51,7 @@
- char *strsave(const char *s);
- int is_prime(unsigned);
-
-+#include <eucmac.h>
- #include <stdio.h>
-
- FILE *xtmpfile();
diff --git a/japanese/ipadic/DESCR b/japanese/ipadic/DESCR
deleted file mode 100644
index 31f62b02164..00000000000
--- a/japanese/ipadic/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-Japanese Morphological Dictionary for ChaSen.
diff --git a/japanese/ipadic/Makefile b/japanese/ipadic/Makefile
deleted file mode 100644
index 97a1c5ecd70..00000000000
--- a/japanese/ipadic/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: Makefile,v 1.13 2002/02/18 15:14:22 seb Exp $
-#
-
-DISTNAME= ipadic-2.4.4
-CATEGORIES= japanese
-MASTER_SITES= http://chasen.aist-nara.ac.jp/stable/ipadic/
-
-MAINTAINER= tech-pkg-ja@jp.netbsd.org
-HOMEPAGE= http://chasen.aist-nara.ac.jp/
-COMMENT= Japanese Morphological Dictionary for ChaSen
-
-DEPENDS= chasen-base>=2.2.5:../../japanese/chasen-base
-
-GNU_CONFIGURE= # defined
-CONF_FILES= ${CHASEN_DICDIR}/chasenrc.example \
- ${CHASEN_CONFDIR}/chasenrc
-
-post-install:
- ${INSTALL_DATA} ${WRKSRC}/chasenrc \
- ${LOCALBASE}/share/chasen/dic/ipadic/chasenrc.example
-
-.include "../chasen/Makefile.common"
-.include "../../mk/bsd.pkg.install.mk"
-.include "../../mk/texinfo.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/japanese/ipadic/PLIST b/japanese/ipadic/PLIST
deleted file mode 100644
index 79e165fa362..00000000000
--- a/japanese/ipadic/PLIST
+++ /dev/null
@@ -1,18 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2002/02/18 15:14:23 seb Exp $
-@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/ipadic-ja.info
-info/ipadic-ja.info
-info/ipadic-ja.info-1
-info/ipadic-ja.info-2
-info/ipadic-ja.info-3
-@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/ipadic-ja.info
-share/chasen/dic/ipadic/cforms.cha
-share/chasen/dic/ipadic/chadic.ary
-share/chasen/dic/ipadic/chadic.int
-share/chasen/dic/ipadic/chadic.pat
-share/chasen/dic/ipadic/chasenrc.example
-share/chasen/dic/ipadic/connect.cha
-share/chasen/dic/ipadic/ctypes.cha
-share/chasen/dic/ipadic/grammar.cha
-share/chasen/dic/ipadic/matrix.cha
-share/chasen/dic/ipadic/table.cha
-@dirrm share/chasen/dic/ipadic
diff --git a/japanese/ipadic/distinfo b/japanese/ipadic/distinfo
deleted file mode 100644
index d85bcdaaa8f..00000000000
--- a/japanese/ipadic/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.4 2002/02/09 07:36:58 taca Exp $
-
-SHA1 (ipadic-2.4.4.tar.gz) = 056b6c9991b762b2fd4776e89728a55cf6e2e154
-Size (ipadic-2.4.4.tar.gz) = 2873402 bytes
-SHA1 (patch-aa) = 472b22da1b79d7bc3d212767277e928d786ccd56
-SHA1 (patch-ab) = ed29e17cd2bfe2f0fe3732f8ca757a798dfb5b3d
-SHA1 (patch-ad) = ebce7f05ae7711b9dbda9dbdaa8e8e5caa5e4f20
-SHA1 (patch-ae) = cccab60a47d8be8ee156b1867bd21553068b9b11
diff --git a/japanese/ipadic/patches/patch-aa b/japanese/ipadic/patches/patch-aa
deleted file mode 100644
index c3925801192..00000000000
--- a/japanese/ipadic/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2001/03/23 23:33:13 taca Exp $
-
---- configure.in.orig Thu Mar 22 05:41:31 2001
-+++ configure.in
-@@ -97,7 +97,7 @@
- CHASEN_GENDATA="matrix.cha table.cha chadic.int chadic.pat chadic.ary"
- AC_SUBST(CHASEN_GENDATA)
-
--CHASEN_PREDATA="grammar.cha ctypes.cha cforms.cha chasenrc connect.cha Makefile.bat"
-+CHASEN_PREDATA="grammar.cha ctypes.cha cforms.cha connect.cha"
- AC_SUBST(CHASEN_PREDATA)
-
- AC_OUTPUT([Makefile chasenrc ipadic.spec doc/Makefile])
diff --git a/japanese/ipadic/patches/patch-ab b/japanese/ipadic/patches/patch-ab
deleted file mode 100644
index 88cc9bcab92..00000000000
--- a/japanese/ipadic/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2001/03/23 23:33:13 taca Exp $
-
---- configure.orig Fri Mar 23 02:51:03 2001
-+++ configure
-@@ -1059,7 +1059,7 @@
- CHASEN_GENDATA="matrix.cha table.cha chadic.int chadic.pat chadic.ary"
-
-
--CHASEN_PREDATA="grammar.cha ctypes.cha cforms.cha chasenrc connect.cha Makefile.bat"
-+CHASEN_PREDATA="grammar.cha ctypes.cha cforms.cha connect.cha"
-
-
- trap '' 1 2 15
diff --git a/japanese/ipadic/patches/patch-ad b/japanese/ipadic/patches/patch-ad
deleted file mode 100644
index 4ed126bdbdd..00000000000
--- a/japanese/ipadic/patches/patch-ad
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2002/02/09 07:36:58 taca Exp $
-
---- Makefile.am.orig Thu Mar 22 05:41:31 2001
-+++ Makefile.am
-@@ -28,11 +28,6 @@
- $(MKDICDIR)/mkary -l -o chadic.ary chadic.int
-
- install-data-local:
-- if test -f @CHASEN_CHASENRC_PATH@ ; then \
-- echo "Please modify @CHASEN_CHASENRC_PATH@"; \
-- else \
-- cp chasenrc @CHASEN_CHASENRC_PATH@ ;\
-- fi
-
- sjis-dist: distdir
- cp -R ipadic-@VERSION@ ipadic-sjis-@VERSION@
diff --git a/japanese/ipadic/patches/patch-ae b/japanese/ipadic/patches/patch-ae
deleted file mode 100644
index 81f23b5f979..00000000000
--- a/japanese/ipadic/patches/patch-ae
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2002/02/09 07:36:59 taca Exp $
-
---- Makefile.in.orig Sat Feb 9 16:00:40 2002
-+++ Makefile.in
-@@ -375,11 +375,6 @@
- $(MKDICDIR)/mkary -l -o chadic.ary chadic.int
-
- install-data-local:
-- if test -f @CHASEN_CHASENRC_PATH@ ; then \
-- echo "Please modify @CHASEN_CHASENRC_PATH@"; \
-- else \
-- cp chasenrc @CHASEN_CHASENRC_PATH@ ;\
-- fi
-
- sjis-dist: distdir
- cp -R ipadic-@VERSION@ ipadic-sjis-@VERSION@
diff --git a/japanese/jhd/DESCR b/japanese/jhd/DESCR
deleted file mode 100644
index 71bf03db56e..00000000000
--- a/japanese/jhd/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-Jhd is a 'Japanese Hexdecimal Dump' command. This is for EUC KANJI
-code, as default.
-
-Example
-
- % jhd -j EUC_FILE
diff --git a/japanese/jhd/Makefile b/japanese/jhd/Makefile
deleted file mode 100644
index bc9e20bad68..00000000000
--- a/japanese/jhd/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2001/03/27 03:20:02 hubertf Exp $
-# FreeBSD Id: Makefile,v 1.2 1999/05/01 04:00:25 taoka Exp $
-
-DISTNAME= jhd-2.3
-CATEGORIES= japanese
-MASTER_SITES= ftp://ftp.iamas.ac.jp/pub1/UNIX/File/
-
-MAINTAINER= tech-pkg-ja@jp.netbsd.org
-COMMENT= Japanese Hexdecimal Dump
-
-BUILD_DEPENDS= nkf-1.7:../../japanese/nkf
-
-post-build:
- @(cd ${WRKSRC}; ${MV} jhd.1 jhd.1.org; nkf -e jhd.1.org > jhd.1)
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/jhd ${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/jhd.1 ${PREFIX}/man/ja_JP.EUC/man1
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/japanese/jhd/PLIST b/japanese/jhd/PLIST
deleted file mode 100644
index 25f2dab9e02..00000000000
--- a/japanese/jhd/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:29:13 zuntum Exp $
-bin/jhd
-man/ja_JP.EUC/man1/jhd.1
diff --git a/japanese/jhd/distinfo b/japanese/jhd/distinfo
deleted file mode 100644
index 656e198d7db..00000000000
--- a/japanese/jhd/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 10:13:33 wiz Exp $
-
-SHA1 (jhd-2.3.tar.gz) = 6df8f56185b5a079eb624cc6e16eabc767e94d47
-Size (jhd-2.3.tar.gz) = 7310 bytes
diff --git a/japanese/kakasi/DESCR b/japanese/kakasi/DESCR
deleted file mode 100644
index 56390446943..00000000000
--- a/japanese/kakasi/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
- KAKASI is language processing filter to convert Kanji characters to
-Hiragana, Katakana or Roman alphabetic Japanese and may be helpful to
-read Japanese documents. By converting documents written in kanji to
-Roman alphabetic Japanese, those documents can be viewed on systems
-without Japanese language capability.
-
-- Masafumi
diff --git a/japanese/kakasi/Makefile b/japanese/kakasi/Makefile
deleted file mode 100644
index bee324d60da..00000000000
--- a/japanese/kakasi/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: Makefile,v 1.13 2001/11/26 06:22:02 jlam Exp $
-# FreeBSD Id: Makefile,v 1.14 1998/04/05 04:46:33 max Exp $
-
-DISTNAME= kakasi-2.3.4
-CATEGORIES= japanese
-MASTER_SITES= ftp://kakasi.namazu.org/pub/kakasi/stable/
-
-MAINTAINER= tech-pkg-ja@jp.netbsd.org
-HOMEPAGE= http://kakasi.namazu.org/
-COMMENT= Kanji-Kana Simple Inverter, language filter for Japanese
-
-USE_BUILDLINK_ONLY= YES
-GNU_CONFIGURE= YES
-USE_GMAKE= YES
-USE_LIBTOOL= YES
-LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
-
-post-install:
- ${INSTALL_MAN} ${WRKSRC}/doc/kakasi.1 ${PREFIX}/man/ja_JP.EUC/man1
- ${INSTALL_MAN} ${WRKSRC}/doc/kakasi.cat \
- ${PREFIX}/man/ja_JP.EUC/cat1/kakasi.0
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/japanese/kakasi/PLIST b/japanese/kakasi/PLIST
deleted file mode 100644
index 3c1e26a4ae8..00000000000
--- a/japanese/kakasi/PLIST
+++ /dev/null
@@ -1,18 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:29:14 zuntum Exp $
-bin/atoc_conv
-bin/kakasi
-bin/kakasi-config
-bin/mkkanwa
-bin/rdic_conv
-bin/wx2_conv
-include/libkakasi.h
-lib/libkakasi.a
-lib/libkakasi.la
-lib/libkakasi.so
-lib/libkakasi.so.3
-lib/libkakasi.so.3.0
-man/ja_JP.EUC/cat1/kakasi.0
-man/ja_JP.EUC/man1/kakasi.1
-share/kakasi/itaijidict
-share/kakasi/kanwadict
-@dirrm share/kakasi
diff --git a/japanese/kakasi/buildlink.mk b/japanese/kakasi/buildlink.mk
deleted file mode 100644
index 040cc3bf1e6..00000000000
--- a/japanese/kakasi/buildlink.mk
+++ /dev/null
@@ -1,49 +0,0 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/11/26 06:22:03 jlam Exp $
-#
-# This Makefile fragment is included by packages that use kakasi.
-#
-# To use this Makefile fragment, simply:
-#
-# (1) Optionally define BUILDLINK_DEPENDS.kakasi to the dependency pattern
-# for the version of kakasi desired.
-# (2) Include this Makefile fragment in the package Makefile,
-# (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header
-# search path, and
-# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search
-# path.
-
-.if !defined(KAKASI_BUILDLINK_MK)
-KAKASI_BUILDLINK_MK= # defined
-
-.include "../../mk/bsd.buildlink.mk"
-
-BUILDLINK_DEPENDS.kakasi?= kakasi>=2.3.0
-DEPENDS+= ${BUILDLINK_DEPENDS.kakasi}:../../japanese/kakasi
-
-EVAL_PREFIX+= BUILDLINK_PREFIX.kakasi=kakasi
-BUILDLINK_PREFIX.kakasi_DEFAULT= ${LOCALBASE}
-BUILDLINK_FILES.kakasi= include/libkakasi.h
-BUILDLINK_FILES.kakasi+= lib/libkakasi.*
-
-BUILDLINK_TARGETS.kakasi= kakasi-buildlink
-BUILDLINK_TARGETS.kakasi+= kakasi-buildlink-config-wrapper
-BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.kakasi}
-
-BUILDLINK_CONFIG.kakasi= \
- ${BUILDLINK_PREFIX.kakasi}/bin/kakasi-config
-BUILDLINK_CONFIG_WRAPPER.kakasi= \
- ${BUILDLINK_DIR}/bin/kakasi-config
-REPLACE_BUILDLINK_SED+= \
- -e "s|${BUILDLINK_CONFIG_WRAPPER.kakasi}|${BUILDLINK_CONFIG.kakasi}|g"
-
-.if defined(USE_CONFIG_WRAPPER)
-KAKASI_CONFIG?= ${BUILDLINK_CONFIG_WRAPPER.kakasi}
-CONFIGURE_ENV+= KAKASI_CONFIG="${KAKASI_CONFIG}"
-MAKE_ENV+= KAKASI_CONFIG="${KAKASI_CONFIG}"
-.endif
-
-pre-configure: ${BUILDLINK_TARGETS.kakasi}
-kakasi-buildlink: _BUILDLINK_USE
-kakasi-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE
-
-.endif # KAKASI_BUILDLINK_MK
diff --git a/japanese/kakasi/distinfo b/japanese/kakasi/distinfo
deleted file mode 100644
index b6cbbc846e1..00000000000
--- a/japanese/kakasi/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.3 2001/09/18 16:17:56 taca Exp $
-
-SHA1 (kakasi-2.3.4.tar.gz) = ab95a226f301955d2e8ae0d347afbb567e25fbe7
-Size (kakasi-2.3.4.tar.gz) = 1099258 bytes
-SHA1 (patch-aa) = 4b724f71d04fe52467b37bed79eef6407427ab29
-SHA1 (patch-ab) = 06ad60e10c996500242fe038213164ddf3147178
diff --git a/japanese/kakasi/patches/patch-aa b/japanese/kakasi/patches/patch-aa
deleted file mode 100644
index 56f401d1468..00000000000
--- a/japanese/kakasi/patches/patch-aa
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-aa,v 1.7 2001/09/18 16:17:56 taca Exp $
-
---- lib/libkakasi.c.orig Sun Sep 2 20:43:21 2001
-+++ lib/libkakasi.c
-@@ -105,6 +105,12 @@
- static int digest PARAMS((Character *c, int clen, Character *r, int rlen, int type, int (*proc)(void)));
- static void digest_shift PARAMS((Character *c, int s));
- #else /* LIBRARY */
-+void digest_start_copy PARAMS((Character *c, Character *r));
-+void put_separator PARAMS((void));
-+void putchars PARAMS((Character *results));
-+void digest_out PARAMS((Character *c, int ret));
-+int digest PARAMS((Character *c, int clen, Character *r, int rlen, int type, int (*proc)(void)));
-+void digest_shift PARAMS((Character *c, int s));
- static void free_jisyo PARAMS((void));
- #endif /* LIBRARY */
-
-@@ -497,7 +503,7 @@
-
- char *
- kakasi_do(str)
-- char *str;
-+ unsigned char *str;
- {
- Character c[KAKASIBUF], r[KAKASIBUF];
- int clen, ptype, pctype;
diff --git a/japanese/kakasi/patches/patch-ab b/japanese/kakasi/patches/patch-ab
deleted file mode 100644
index cd6b824fbc9..00000000000
--- a/japanese/kakasi/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2001/09/18 16:17:56 taca Exp $
-
---- lib/libkakasi.h.orig Mon Aug 27 11:11:56 2001
-+++ lib/libkakasi.h
-@@ -31,7 +31,7 @@
- #endif
-
- int kakasi_getopt_argv PARAMS((int argc, char **argv));
--char *kakasi_do PARAMS((char *str));
-+char *kakasi_do PARAMS((unsigned char *str));
- int kakasi_close_kanwadict PARAMS((void));
- int kakasi_free PARAMS((char *p));
-
diff --git a/japanese/kbanner/DESCR b/japanese/kbanner/DESCR
deleted file mode 100644
index 35fb22acfeb..00000000000
--- a/japanese/kbanner/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-Kbanner reads each filename in sequence and displays it
-in large letters on the standard output. JIS, EUC, and
-Shifted-JIS codes are available for kanji code.
diff --git a/japanese/kbanner/Makefile b/japanese/kbanner/Makefile
deleted file mode 100644
index 62e875ef8d1..00000000000
--- a/japanese/kbanner/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2001/02/16 15:25:19 wiz Exp $
-
-DISTNAME= kbanner2
-PKGNAME= kbanner-2.1
-CATEGORIES= japanese
-MASTER_SITES= ftp://ginkaku.kudpc.kyoto-u.ac.jp/program/
-EXTRACT_SUFX= .tar.Z
-
-MAINTAINER= packages@netbsd.org
-HOMEPAGE= http://www.kudpc.kyoto-u.ac.jp/~yasuoka/program.html
-COMMENT= Display kanji files in large letters
-
-ALL_TARGET= kbanner
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/japanese/kbanner/PLIST b/japanese/kbanner/PLIST
deleted file mode 100644
index e8c07f79abb..00000000000
--- a/japanese/kbanner/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:29:15 zuntum Exp $
-bin/kbanner
-man/man1/kbanner.1
diff --git a/japanese/kbanner/distinfo b/japanese/kbanner/distinfo
deleted file mode 100644
index 76980678f6b..00000000000
--- a/japanese/kbanner/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 10:13:33 wiz Exp $
-
-SHA1 (kbanner2.tar.Z) = a557fd49ef76797513894ac8f7e218be52efb219
-Size (kbanner2.tar.Z) = 240221 bytes
-SHA1 (patch-aa) = 0b30d5b1af326e28fe581486931336b27dd26124
-SHA1 (patch-ab) = a85c604703743047147e15a48705ad5f517e5273
-SHA1 (patch-ac) = 1f6964b8c936199e408ab5aceb06ddeb1a249751
-SHA1 (patch-ad) = 9f3a26d4ac3eab9e9c0094d02de09925f47b2b7b
-SHA1 (patch-ae) = d4a97bba0fac13b728335b98b7369d47e8aa9b8d
-SHA1 (patch-af) = 2d8c602ccc0990ffc0c5c1711b8e5c707e710126
diff --git a/japanese/kbanner/patches/patch-aa b/japanese/kbanner/patches/patch-aa
deleted file mode 100644
index c4c8dbf4a27..00000000000
--- a/japanese/kbanner/patches/patch-aa
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/05/18 09:08:10 itohy Exp $
-
---- Makefile.orig Fri Oct 15 14:19:54 1993
-+++ Makefile Thu May 18 00:48:33 2000
-@@ -1,21 +1,21 @@
- SHELL = /bin/sh
--DESTDIR = /usr/local/bin
--MANUAL = /usr/local/man/man1/kbanner.1
--CFLAGS = -O -KEOPT -KBREG -KINF
-+DESTDIR = $(PREFIX)/bin
-+MANUAL = $(PREFIX)/man/man1/kbanner.1
-+#CFLAGS = -O -KEOPT -KBREG -KINF
- OBJ = kbanner.o font1.o font2.o font3.o
-
- .SUFFIXES: .c .o
-
- .c.o:
-- cc -c $(CFLAGS) $<
-+ $(CC) -c $(CFLAGS) $<
-
- kbanner: $(OBJ)
-- cc $(OBJ) -o kbanner
-+ $(CC) $(OBJ) -o kbanner
- strip kbanner
-
- clean:
- rm -f *.o core
-
- install: kbanner
-- cp kbanner $(DESTDIR)/
-- cp kbanner.1 $(MANUAL)
-+ $(BSD_INSTALL_PROGRAM) kbanner $(DESTDIR)/
-+ $(BSD_INSTALL_MAN) kbanner.1 $(MANUAL)
diff --git a/japanese/kbanner/patches/patch-ab b/japanese/kbanner/patches/patch-ab
deleted file mode 100644
index b2e899b9834..00000000000
--- a/japanese/kbanner/patches/patch-ab
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/05/18 09:08:10 itohy Exp $
-
---- kbanner.c.orig Fri Oct 15 17:43:31 1993
-+++ kbanner.c Thu May 18 00:28:39 2000
-@@ -3,7 +3,7 @@
- #include <stdio.h>
-
- extern char *malloc();
--extern unsigned short
-+extern const unsigned short
- font21[],font22[],font23[],font24[],font25[],font26[],font27[],
- font28[],
- font30[],font31[],font32[],font33[],font34[],font35[],font36[],font37[],
-@@ -16,7 +16,7 @@
- font68[],font69[],font6a[],font6b[],font6c[],font6d[],font6e[],font6f[],
- font70[],font71[],font72[],font73[],font74[];
-
--unsigned short *font[]={
-+const unsigned short *const font[]={
- font21,font22,font23,font24,font25,font26,font27,
- font28, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- font30,font31,font32,font33,font34,font35,font36,font37,
-@@ -31,7 +31,7 @@
- NULL, NULL, NULL, NULL, NULL, NULL, NULL
- };
-
--int table[]={
-+const int table[]={
- 0x212a,0x2149,0x2174,0x2170,0x2173,0x2175,0x2147,
- 0x214a,0x214b,0x2176,0x215c,0x2124,0x215d,0x2125,0x213f,
- 0x2330,0x2331,0x2332,0x2333,0x2334,0x2335,0x2336,0x2337,
-@@ -55,10 +55,10 @@
- };
-
- int landscape,small,column,col,mime,encoding,bufindex,buflength;
--unsigned short **image;
-+const unsigned short **image;
- int buf[16];
-
--int b_encoding[]={
-+const int b_encoding[]={
- -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
- -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
- -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,62,-1,-1,-1,63,
-@@ -121,7 +121,7 @@
- }
- if(landscape)
- column=1;
-- if((image=(unsigned short**)malloc(sizeof(unsigned short*)*column))==NULL){
-+ if((image=(const unsigned short**)malloc(sizeof(unsigned short*)*column))==NULL){
- fprintf(stderr,"%s: Not enough memory\n",com);
- exit(1);
- }
diff --git a/japanese/kbanner/patches/patch-ac b/japanese/kbanner/patches/patch-ac
deleted file mode 100644
index 08009337e3c..00000000000
--- a/japanese/kbanner/patches/patch-ac
+++ /dev/null
@@ -1,235 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2000/05/18 09:08:10 itohy Exp $
-
---- font1.c.orig Fri Oct 15 14:18:50 1993
-+++ font1.c Thu May 18 00:27:02 2000
-@@ -1,4 +1,4 @@
--unsigned short font21[]={
-+const unsigned short font21[]={
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
-@@ -188,7 +188,7 @@
- 0x0180,0x0240,0x0420,0x0810,0x1008,0x2004,0x4002,0x8001,
- 0x8001,0x4002,0x2004,0x1008,0x0810,0x0420,0x0240,0x0180
- };
--unsigned short font22[]={
-+const unsigned short font22[]={
- 0x0180,0x03c0,0x07e0,0x0ff0,0x1ff8,0x3ffc,0x7ffe,0xffff,
- 0xffff,0x7ffe,0x3ffc,0x1ff8,0x0ff0,0x07e0,0x03c0,0x0180,
- 0x0000,0x7ffe,0x4002,0x4002,0x4002,0x4002,0x4002,0x4002,
-@@ -378,7 +378,7 @@
- 0x03c0,0x0c30,0x1008,0x2004,0x4002,0x4002,0x8001,0x8001,
- 0x8001,0x8001,0x4002,0x4002,0x2004,0x1008,0x0c30,0x03c0
- };
--unsigned short font23[]={
-+const unsigned short font23[]={
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
-@@ -568,7 +568,7 @@
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000
- };
--unsigned short font24[]={
-+const unsigned short font24[]={
- 0x0000,0x0000,0x0000,0x0000,0x0100,0x0100,0x1ff8,0x0240,
- 0x03f0,0x0658,0x0a4c,0x1284,0x1284,0x110c,0x0e18,0x0060,
- 0x0200,0x0200,0x3ff8,0x0400,0x0440,0x07f0,0x1c5c,0x3444,
-@@ -758,7 +758,7 @@
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000
- };
--unsigned short font25[]={
-+const unsigned short font25[]={
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x1ffc,0x000c,
- 0x0118,0x0130,0x0100,0x0100,0x0300,0x0200,0x0600,0x0c00,
- 0x0000,0x0000,0x7ffe,0x0006,0x010c,0x0118,0x0130,0x0100,
-@@ -948,7 +948,7 @@
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000
- };
--unsigned short font26[]={
-+const unsigned short font26[]={
- 0x0000,0x0100,0x0100,0x0380,0x0280,0x06c0,0x0440,0x0c60,
- 0x0820,0x1ff0,0x1010,0x3018,0x2008,0xf83e,0x0000,0x0000,
- 0x0000,0x3fe0,0x0810,0x0808,0x0808,0x0808,0x0810,0x0fe0,
-@@ -1138,7 +1138,7 @@
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000
- };
--unsigned short font27[]={
-+const unsigned short font27[]={
- 0x0000,0x0100,0x0700,0x0380,0x0280,0x06c0,0x0440,0x0c60,
- 0x0820,0x1ff0,0x1010,0x3018,0x2008,0xf83e,0x0000,0x0000,
- 0x0000,0x3ff8,0x0808,0x0808,0x0800,0x0800,0x0800,0x0ff0,
-@@ -1328,7 +1328,7 @@
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000
- };
--unsigned short font28[]={
-+const unsigned short font28[]={
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0xffff,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0100,0x0100,0x0100,0x0100,0x0100,0x0100,0x0100,0x0100,
-@@ -1518,7 +1518,7 @@
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000
- };
--unsigned short font30[]={
-+const unsigned short font30[]={
- 0x0000,0x7ffe,0x0440,0x0440,0x0440,0x3ffc,0x2444,0x2444,
- 0x2444,0x2444,0x3ffc,0x0440,0x0440,0x0440,0xffff,0x0000,
- 0x0000,0x0fff,0xf090,0x9090,0x9090,0x97fe,0x9492,0x9492,
-@@ -1708,7 +1708,7 @@
- 0x0420,0xffff,0x0420,0x0000,0x7830,0x4848,0x48b4,0x5303,
- 0x50fc,0x4808,0x49fe,0x4800,0x5bff,0x4084,0x413e,0x43e3
- };
--unsigned short font31[]={
-+const unsigned short font31[]={
- 0x0020,0x7820,0x4bfe,0x4a02,0x4a02,0x51fc,0x5000,0x4800,
- 0x4fff,0x4890,0x4890,0x4890,0x5990,0x4111,0x4313,0x460e,
- 0x0020,0x7870,0x48d8,0x498c,0x4b76,0x5603,0x51fc,0x4808,
-@@ -1898,7 +1898,7 @@
- 0x0080,0x0080,0x3fff,0x2000,0x20c0,0x2060,0x2130,0x2110,
- 0x2500,0x2504,0x2506,0x2d03,0x6901,0x4904,0xc18c,0x00f8
- };
--unsigned short font32[]={
-+const unsigned short font32[]={
- 0x2000,0x23fe,0x2222,0x2222,0xfa22,0x23fe,0x2222,0x2222,
- 0x2222,0x3a22,0xe3fe,0x2020,0x2020,0x2020,0x2020,0x6020,
- 0x0000,0xfbfe,0x8820,0x8820,0x8820,0x8820,0xf820,0x8bfe,
-@@ -2088,7 +2088,7 @@
- 0x0040,0x0040,0xfe40,0x027f,0x0244,0x02c4,0x7ea4,0x41ac,
- 0x4028,0x4038,0x4010,0x4238,0x6228,0x3e6c,0x00c6,0x0183
- };
--unsigned short font33[]={
-+const unsigned short font33[]={
- 0x0804,0x1064,0x7f34,0x4914,0x4904,0x7f64,0x4934,0x4914,
- 0x7f07,0x247c,0x2504,0x2544,0x27c4,0x6405,0x4603,0xc3fe,
- 0x0100,0x0100,0x7bfe,0x4a00,0x4c00,0x49fc,0x4924,0x7924,
-@@ -2278,7 +2278,7 @@
- 0x0810,0x0810,0xffff,0x0810,0x0100,0x7ffe,0x4002,0x5ffa,
- 0x0000,0x1ff8,0x1008,0x1ff8,0x1008,0x1ff8,0x0000,0xffff
- };
--unsigned short font34[]={
-+const unsigned short font34[]={
- 0x0000,0xf11e,0x1542,0x1542,0x1542,0xf11e,0x8ff0,0x8110,
- 0xf39e,0x1382,0x1542,0x1542,0x1922,0x3106,0x2104,0xe01c,
- 0x0102,0x0112,0x0112,0x0112,0x6312,0x3212,0x1a12,0x0e12,
-@@ -2468,7 +2468,7 @@
- 0x0100,0xffff,0x0410,0x0808,0x3ff4,0x0000,0x1108,0xffff,
- 0x1108,0x1ff8,0x0100,0xffff,0x0520,0x1d38,0xf10f,0x0100
- };
--unsigned short font35[]={
-+const unsigned short font35[]={
- 0x2122,0x2224,0x26ad,0xf922,0x2225,0x22af,0x67a4,0x7022,
- 0x6bff,0xaa20,0xa212,0x2314,0x2288,0x2695,0x2427,0x2cc2,
- 0x1000,0x11fc,0x5004,0x51fc,0x5004,0x51fc,0x5000,0x57ff,
-@@ -2658,7 +2658,7 @@
- 0x0100,0x0100,0x0100,0xffff,0x0000,0x1ff8,0x1008,0x1008,
- 0x1008,0x1ff8,0x0100,0x0910,0x1918,0x310c,0xe107,0x0700
- };
--unsigned short font36[]={
-+const unsigned short font36[]={
- 0x1108,0x1108,0x3108,0x2108,0x27fe,0x6108,0x6108,0xa108,
- 0x2108,0x2108,0x2fff,0x2000,0x2108,0x230c,0x2606,0x2c03,
- 0x1040,0x1040,0x37fe,0x2040,0x2444,0x664c,0x6248,0xa248,
-@@ -2848,7 +2848,7 @@
- 0x0000,0x3ffe,0x2002,0x2002,0x3ffe,0x2000,0x2040,0x2444,
- 0x2444,0x2444,0x27fc,0x2040,0x6842,0x4842,0xc842,0x0ffe
- };
--unsigned short font37[]={
-+const unsigned short font37[]={
- 0x2000,0x23fe,0x2202,0x2202,0xfbfe,0x2200,0x2210,0x2292,
- 0x3a92,0xe2fe,0x2210,0x2210,0x2692,0x2492,0x2c92,0x60fe,
- 0x0100,0x0100,0x7ffe,0x4422,0x583f,0xe000,0x3ffe,0x2002,
-@@ -3038,7 +3038,7 @@
- 0x2222,0x2326,0x2124,0x23fe,0xf850,0x2050,0x27ff,0x2088,
- 0x3904,0xe3fe,0x260b,0x2008,0x21f8,0x2102,0x2106,0x60fc
- };
--unsigned short font38[]={
-+const unsigned short font38[]={
- 0x1020,0x1070,0x10d8,0xf98c,0x1707,0x11fc,0x3020,0x3bfe,
- 0x3622,0x5222,0x5222,0x93fe,0x1050,0x10d8,0x118c,0x1707,
- 0x1100,0x1100,0x11fe,0xff40,0x1240,0x17ff,0x3088,0x3890,
-@@ -3228,7 +3228,7 @@
- 0x0100,0x0300,0x0200,0x7ffe,0x4002,0x4002,0x47e2,0x4422,
- 0x4422,0x4422,0x4422,0x47e2,0x4002,0x4002,0x4002,0x400e
- };
--unsigned short font39[]={
-+const unsigned short font39[]={
- 0x000c,0x00f8,0x3f80,0x2000,0x2000,0x3fff,0x2000,0x2000,
- 0x27fc,0x2404,0x2404,0x2404,0x6404,0x4404,0xc404,0x07fc,
- 0x0200,0x02fc,0xf204,0x9204,0x95ff,0x9400,0x9c80,0x94fe,
-@@ -3418,7 +3418,7 @@
- 0x0000,0x63e0,0x3020,0x1020,0x0020,0x0020,0x0070,0xf050,
- 0x10d8,0x1088,0x118c,0x1306,0x1603,0x3000,0x6800,0xc7ff
- };
--unsigned short font3a[]={
-+const unsigned short font3a[]={
- 0x0840,0x0840,0x0840,0x4843,0x4846,0x485c,0x4f70,0x4840,
- 0x4840,0x4840,0x4840,0x4840,0x4840,0x4f41,0x7863,0xc03e,
- 0x0000,0x43ff,0x4020,0x41fe,0x4d02,0x7902,0x41fe,0x4102,
-@@ -3608,7 +3608,7 @@
- 0x0002,0x7f92,0x4092,0x4092,0x7f92,0x4412,0x4412,0x5f92,
- 0x5492,0x5492,0x5492,0x5482,0xd482,0x9582,0x8402,0x040e
- };
--unsigned short font3b[]={
-+const unsigned short font3b[]={
- 0x0100,0x0100,0x7ffe,0x4802,0x4f7a,0x1188,0x6a50,0x2420,
- 0x1818,0xe7e7,0x0000,0x3ffc,0x0100,0x1918,0x710e,0x0700,
- 0x2111,0x2333,0x2222,0x2666,0xfb33,0x2111,0x2040,0x207e,
-@@ -3798,7 +3798,7 @@
- 0x0020,0x0020,0xf9fe,0x8820,0x8820,0x8820,0xfbff,0x8804,
- 0x8804,0x8bff,0x8804,0xf984,0x00c4,0x0044,0x0004,0x001c
- };
--unsigned short font3c[]={
-+const unsigned short font3c[]={
- 0x0100,0x0100,0x6100,0x31fe,0x1302,0x0246,0x0644,0x0040,
- 0x1040,0x10e0,0x30a0,0x21b0,0x6110,0x4318,0xc60c,0x1c07,
- 0x0104,0x618c,0x3088,0x17ff,0x0104,0xc104,0x6208,0x2208,
-@@ -3988,7 +3988,7 @@
- 0x0000,0x3ffe,0x2002,0x2082,0x27f2,0x2082,0x2082,0x2ffa,
- 0x2002,0x27f2,0x2412,0x2412,0x2412,0x67f2,0x4002,0xc00e
- };
--unsigned short font3d[]={
-+const unsigned short font3d[]={
- 0x0100,0x0100,0x7ffe,0x4002,0x4002,0x4ff2,0x0000,0x0000,
- 0xffff,0x0100,0x1108,0x1108,0x310c,0x6106,0xc103,0x0700,
- 0x0814,0x0816,0x0812,0xff90,0x007f,0x7f10,0x4110,0x4110,
-@@ -4178,7 +4178,7 @@
- 0x1222,0x1124,0x37ff,0x2401,0x25fd,0x6104,0x61fc,0xa000,
- 0x23fe,0x2202,0x23fe,0x2202,0x23fe,0x2202,0x23fe,0x2603
- };
--unsigned short font3e[]={
-+const unsigned short font3e[]={
- 0x0040,0x7a44,0x4948,0x4840,0x4bfe,0x7890,0x4890,0x4fff,
- 0x490c,0x7b46,0x4e43,0x49fc,0x4844,0x48c4,0xc984,0x9b1c,
- 0x0000,0x7ffe,0x4000,0x4038,0x47e0,0x4400,0x47fe,0x4420,
-@@ -4368,7 +4368,7 @@
- 0x1040,0x3840,0x2c40,0x64ff,0x5090,0xfd10,0x44fe,0x7c92,
- 0x4492,0x7c92,0x4092,0x4892,0x4892,0x4c96,0x7410,0xc010
- };
--unsigned short font3f[]={
-+const unsigned short font3f[]={
- 0x2010,0x2014,0x2016,0x2012,0xfbff,0x2010,0x2010,0x27d0,
- 0x3918,0xe108,0x2108,0x2108,0x21cc,0x2705,0x2007,0x6002,
- 0x1010,0x1010,0x11ff,0xfc10,0x107e,0x1142,0x3942,0x357e,
-@@ -4558,7 +4558,7 @@
- 0x2000,0x21fe,0x2102,0xf902,0x09fe,0x1910,0x1110,0x35ff,
- 0x2910,0x7110,0xa97e,0x2942,0x2342,0x2242,0x2642,0x207e
- };
--unsigned short font40[]={
-+const unsigned short font40[]={
- 0x0004,0x63e8,0x3451,0x128a,0x0104,0xc6fb,0x6000,0x21fc,
- 0x0104,0x1104,0x11fc,0x3000,0x2104,0x618c,0x4088,0xc7ff,
- 0x2000,0x27df,0x2249,0x2145,0xf841,0x21c7,0x2659,0x2041,
-@@ -4748,7 +4748,7 @@
- 0x1010,0x3020,0x60fe,0xc482,0x6cfe,0x1882,0x3082,0x64fe,
- 0xfc11,0x15d3,0x105a,0x545c,0x54d4,0xd496,0x9193,0x1030
- };
--unsigned short font41[]={
-+const unsigned short font41[]={
- 0x1088,0x308a,0x23eb,0xc889,0x5888,0x37ff,0x2148,0x494a,
- 0xfd5a,0x136a,0x114e,0x5944,0x554c,0xd1ed,0x9717,0x1032,
- 0x0820,0x0440,0x7ffe,0x0100,0x3ffc,0x0100,0xffff,0x0080,
diff --git a/japanese/kbanner/patches/patch-ad b/japanese/kbanner/patches/patch-ad
deleted file mode 100644
index 1bf4c8e0d14..00000000000
--- a/japanese/kbanner/patches/patch-ad
+++ /dev/null
@@ -1,235 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2000/05/18 09:08:10 itohy Exp $
-
---- font2.c.orig Fri Oct 15 14:18:52 1993
-+++ font2.c Thu May 18 00:27:02 2000
-@@ -1,4 +1,4 @@
--unsigned short font42[]={
-+const unsigned short font42[]={
- 0x7088,0x57ff,0x508a,0x5089,0x7004,0x57ff,0x5404,0x55f4,
- 0x7545,0x55f7,0x5516,0x55f4,0x554c,0x55fd,0xd817,0xb062,
- 0x0420,0x0420,0xffff,0x0424,0x0012,0x3fff,0x2010,0x2fd2,
-@@ -188,7 +188,7 @@
- 0x0000,0x1ff8,0x1008,0x1008,0x1008,0x1008,0x1008,0x1008,
- 0x1008,0x1ff8,0x0000,0x0000,0x0810,0x1818,0x300c,0x6006
- };
--unsigned short font43[]={
-+const unsigned short font43[]={
- 0x0000,0x7e7e,0x4242,0x4242,0x4242,0x4242,0x4242,0x4242,
- 0x4242,0x4242,0x4242,0x4242,0x7e4e,0x0040,0x0040,0x0040,
- 0x0800,0x09fc,0x1904,0x1104,0x3104,0x2104,0x61fc,0xa104,
-@@ -378,7 +378,7 @@
- 0x0100,0x7ffe,0x4822,0xff3f,0x4220,0x243e,0xff02,0x003e,
- 0x7e20,0x423e,0x7e20,0x423e,0x7e20,0x423e,0x4221,0x461f
- };
--unsigned short font44[]={
-+const unsigned short font44[]={
- 0x2020,0x2020,0x2020,0xfc20,0xa43f,0xa420,0xa420,0xa420,
- 0xa420,0xa5fe,0xad02,0x2102,0x2102,0x2102,0x2102,0x21fe,
- 0x2000,0x20fe,0x2080,0xfcfc,0xa480,0xa4fc,0xa480,0xa480,
-@@ -568,7 +568,7 @@
- 0x0006,0x403c,0x67e0,0x2420,0x07ff,0x0420,0x07ff,0xe420,
- 0x25fe,0x2522,0x2522,0x2522,0x2926,0x6020,0x5000,0xcfff
- };
--unsigned short font45[]={
-+const unsigned short font45[]={
- 0x0180,0x073f,0x7c21,0x4423,0x4422,0x4426,0x7fa4,0x4422,
- 0x4421,0x4421,0x4621,0x7221,0xc2a7,0x03a0,0xf920,0x0020,
- 0x2100,0x121f,0xffd1,0x1213,0x7f92,0x5296,0x6394,0x4092,
-@@ -758,7 +758,7 @@
- 0x0002,0xffa2,0x2022,0x2122,0x6122,0x4fa2,0xf8a2,0x0822,
- 0x0822,0x7f22,0x0822,0x0802,0x0802,0x0f82,0x3802,0xe00e
- };
--unsigned short font46[]={
-+const unsigned short font46[]={
- 0x0420,0xffff,0x0420,0x1ff8,0x0100,0xffff,0x0100,0x3ffc,
- 0x2104,0x3ffc,0x2104,0x3ffc,0x0100,0x3ffc,0x0100,0xffff,
- 0x0420,0xffff,0x0420,0x0000,0x63fc,0x3204,0x03fc,0xc204,
-@@ -948,7 +948,7 @@
- 0x0000,0x1f00,0x0100,0x0100,0x0100,0x0100,0x0100,0x0380,
- 0x0280,0x02c0,0x0640,0x0460,0x0c30,0x1818,0x300c,0xe007
- };
--unsigned short font47[]={
-+const unsigned short font47[]={
- 0x1000,0x1000,0x1000,0x107e,0xfe42,0x2242,0x2242,0x2242,
- 0x6642,0x4442,0x4442,0xfc42,0x0e42,0x1b7e,0x3100,0xe000,
- 0x0000,0x3ffe,0x2002,0x2002,0x3ffe,0x2000,0x2040,0x2042,
-@@ -1138,7 +1138,7 @@
- 0x0100,0x0100,0x7ffe,0x0100,0x3ffc,0x0100,0xffff,0x0200,
- 0x07f0,0x0c30,0x1860,0x76c0,0x0380,0x06e0,0x1c38,0xf00f
- };
--unsigned short font48[]={
-+const unsigned short font48[]={
- 0x0000,0xffff,0x0200,0x0200,0x4382,0x4892,0x4cb2,0x44a2,
- 0x4082,0x46e2,0x4cb2,0x589a,0x4382,0x4002,0x7ffe,0x0000,
- 0x1040,0x1040,0x3eff,0x6890,0xc508,0x1000,0x107e,0xfe42,
-@@ -1328,7 +1328,7 @@
- 0x0810,0x0420,0x7ffe,0x0100,0x0100,0x3ffc,0x0100,0x0100,
- 0x7ffe,0x0000,0x0100,0xffff,0x0240,0x0660,0x1c38,0xf00f
- };
--unsigned short font49[]={
-+const unsigned short font49[]={
- 0x0200,0x1ff8,0x1008,0x1ff8,0x1008,0x1ff8,0x1008,0x7ffe,
- 0x4102,0x7ffe,0x4102,0x7ffe,0x0810,0xffff,0x1010,0x6010,
- 0x1080,0x1080,0x10f8,0xfd88,0x1318,0x10b0,0x3860,0x34f0,
-@@ -1518,7 +1518,7 @@
- 0x0000,0x7cfe,0x4482,0x4482,0x4486,0x7c80,0x4480,0x44fe,
- 0x44a2,0x7cb6,0x4494,0x449c,0x4488,0x449c,0xc496,0x8cb3
- };
--unsigned short font4a[]={
-+const unsigned short font4a[]={
- 0x1000,0x11ff,0x1000,0xfcfe,0x0482,0x0c82,0x08fe,0x1800,
- 0x3000,0x7dff,0xd711,0x1111,0x11ff,0x1111,0x1111,0x11ff,
- 0x0080,0x7880,0x49ff,0x4b00,0x48fc,0x7884,0x48fc,0x4884,
-@@ -1708,7 +1708,7 @@
- 0x0000,0x3e3e,0x2222,0x2222,0x2222,0x3e3e,0x2222,0x2222,
- 0x2222,0x3e3e,0x2222,0x2222,0x2222,0x6262,0x4242,0xcece
- };
--unsigned short font4b[]={
-+const unsigned short font4b[]={
- 0x0020,0x6020,0x3020,0x13fe,0x0020,0xc020,0x6020,0x27ff,
- 0x0040,0x1040,0x10c4,0x3086,0x2082,0x619f,0x41f1,0xc701,
- 0x0100,0x6100,0x31fe,0x1302,0x0202,0xc3f2,0x6612,0x2012,
-@@ -1898,7 +1898,7 @@
- 0x0088,0x6088,0x33fe,0x1088,0x0088,0xc7ff,0x6020,0x23fe,
- 0x0222,0x12aa,0x12aa,0x32aa,0x22fa,0x6202,0x4202,0xc20e
- };
--unsigned short font4c[]={
-+const unsigned short font4c[]={
- 0x01f8,0x6108,0x31f8,0x1108,0x01f8,0xc000,0x67fe,0x2492,
- 0x07fe,0x1000,0x17fe,0x3104,0x2098,0x6070,0x41dc,0xcf07,
- 0x0420,0xffff,0x0420,0x1ff8,0x1008,0x1ff8,0x1008,0x7ffe,
-@@ -2088,7 +2088,7 @@
- 0x0080,0x3fff,0x20c0,0xa330,0x7def,0x2000,0x2f92,0x2892,
- 0x6f92,0xa892,0x2f92,0x2886,0x6000,0x4942,0xd92b,0x11f9
- };
--unsigned short font4d[]={
-+const unsigned short font4d[]={
- 0x0020,0x7870,0x00d8,0xfd8c,0x0377,0x7800,0x03c2,0x0252,
- 0x7a52,0x03d2,0x0252,0x7a52,0x4bc2,0x4a42,0x4a42,0x7ace,
- 0x2020,0x2070,0xf8d8,0x218c,0xfb77,0xa800,0xabc2,0xfa52,
-@@ -2278,7 +2278,7 @@
- 0x0020,0x0020,0xfbff,0x2000,0x214a,0x2132,0xf94a,0x2102,
- 0x21fe,0x2020,0x23ff,0x3a41,0xe249,0x02f5,0x0201,0x0203
- };
--unsigned short font4e[]={
-+const unsigned short font4e[]={
- 0x0040,0x0040,0x3fff,0xa000,0x6182,0x2f12,0x2212,0x3fd2,
- 0x2212,0x6212,0xa712,0x2692,0x6a82,0x5202,0xc202,0x020e,
- 0x0100,0xffff,0x0000,0x1ff8,0x1108,0x1ff8,0x1108,0x1ff8,
-@@ -2468,7 +2468,7 @@
- 0x0084,0xfd08,0x4a10,0x494a,0x7884,0x4908,0x4a52,0x4bde,
- 0x7800,0x4a49,0x4a49,0x4a49,0x7bcf,0xc848,0x08c8,0x0b88
- };
--unsigned short font4f[]={
-+const unsigned short font4f[]={
- 0x0810,0xffff,0x0810,0x0020,0x67ff,0x3020,0x13fe,0x0222,
- 0x03fe,0xf222,0x13fe,0x1020,0x17ff,0x3020,0x6820,0xc7ff,
- 0x0020,0x6020,0x37ff,0x1020,0x03fe,0x0222,0x0222,0xf3fe,
-@@ -2658,7 +2658,7 @@
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000
- };
--unsigned short font50[]={
-+const unsigned short font50[]={
- 0x004c,0x0046,0x0042,0x0040,0xffff,0x0040,0x0040,0x0040,
- 0x0060,0x0020,0x0020,0xff30,0x0011,0x001b,0x000e,0x0004,
- 0x0000,0xffff,0x0100,0x2100,0x21fe,0x2100,0x2100,0x3ffe,
-@@ -2848,7 +2848,7 @@
- 0x1108,0x1108,0x17c8,0x310f,0x210a,0x6ffa,0x6112,0xa10a,
- 0x2fea,0x220e,0x23c4,0x2244,0x224e,0x264a,0x244a,0x2ddb
- };
--unsigned short font51[]={
-+const unsigned short font51[]={
- 0x0100,0x0380,0x06c0,0x0c70,0x381c,0xe7e7,0x0000,0x3e7c,
- 0x2244,0x2244,0x3e7c,0x0000,0x0810,0x1c38,0x366c,0xe0c7,
- 0x1000,0x1fff,0x1090,0x37fe,0x2492,0x6492,0x67fe,0xa080,
-@@ -3038,7 +3038,7 @@
- 0x1048,0x1248,0xfe7f,0x4a52,0x6a56,0x2a54,0xfe7f,0x1248,
- 0x1248,0xfe7f,0x1248,0x1048,0x30c8,0x2088,0x6188,0xc308
- };
--unsigned short font52[]={
-+const unsigned short font52[]={
- 0x2004,0x27c4,0xfa5f,0x524a,0x524a,0x524a,0xfa5f,0x2244,
- 0x2244,0xfa5f,0x2244,0x2244,0x2244,0x6644,0x4444,0xccc4,
- 0x2010,0x2010,0x2010,0x7f10,0x41ff,0xc111,0x7911,0x4911,
-@@ -3228,7 +3228,7 @@
- 0x0100,0x6100,0x33fe,0x1242,0x06e4,0x00b0,0x1998,0x730c,
- 0xc607,0x0000,0x1ff8,0x1008,0x1008,0x1008,0x1008,0x1ff8
- };
--unsigned short font53[]={
-+const unsigned short font53[]={
- 0x0000,0x7e7e,0x4242,0x4242,0x4242,0x4242,0x4242,0x7e7e,
- 0x4800,0x4824,0x4c24,0x4466,0x46c3,0x4300,0xc1c0,0x807f,
- 0x0000,0x0fff,0xf090,0x9090,0x9090,0x97fe,0x9492,0x9492,
-@@ -3418,7 +3418,7 @@
- 0x0000,0x7ffe,0x4002,0x4102,0x4ff2,0x4102,0x5ffa,0x4422,
- 0x4242,0x4ff2,0x4102,0x5ffa,0x4102,0x4002,0x7ffe,0x0000
- };
--unsigned short font54[]={
-+const unsigned short font54[]={
- 0x0000,0x7ffe,0x4912,0x4522,0x4ff2,0x4242,0x5ffa,0x4422,
- 0x4ff2,0x5a5a,0x42c2,0x4212,0x41f2,0x4002,0x7ffe,0x0000,
- 0x0000,0x7ffe,0x4052,0x404a,0x5ffa,0x4042,0x4f4a,0x494a,
-@@ -3608,7 +3608,7 @@
- 0x0100,0x0100,0xffff,0x0240,0x0c30,0x3ffc,0xe007,0x23f0,
- 0x2210,0x23f0,0x2000,0x2f3c,0x2924,0x2f3c,0x2000,0x3ffe
- };
--unsigned short font55[]={
-+const unsigned short font55[]={
- 0x1000,0x10fe,0x1010,0x1010,0xfe10,0x2210,0x2210,0x23ff,
- 0x6210,0x4610,0x4410,0xfc10,0x0e10,0x1b10,0x3110,0xe010,
- 0x1040,0x1040,0x1040,0x10fe,0xfe82,0x2382,0x2202,0x2262,
-@@ -3798,7 +3798,7 @@
- 0x0000,0x3ffe,0x2002,0x2002,0x3ffe,0x2000,0x2ffe,0x2802,
- 0x2ffe,0x2802,0x2ffe,0x2802,0x6ffe,0x4208,0xc60c,0x1c07
- };
--unsigned short font56[]={
-+const unsigned short font56[]={
- 0x0000,0x3ffe,0x2002,0x2002,0x3ffe,0x2210,0x2610,0x2dff,
- 0x3810,0x22fc,0x2644,0x3c6c,0x6428,0x4438,0xc46c,0x05c7,
- 0x0000,0x3ffe,0x2002,0x2002,0x3ffe,0x2208,0x2110,0x2ffe,
-@@ -3988,7 +3988,7 @@
- 0x0080,0x0080,0x7fff,0x4000,0x5f3c,0x5124,0x5f24,0x5127,
- 0x5140,0x5f00,0x507e,0x5222,0xd214,0x9308,0x9d14,0x3063
- };
--unsigned short font57[]={
-+const unsigned short font57[]={
- 0x0080,0x0080,0x7fff,0x4000,0x5f3e,0x4912,0x470e,0x4952,
- 0x40a2,0x4318,0x5c47,0x4190,0xc662,0x818c,0x8070,0x0780,
- 0x0080,0x0080,0x3fff,0x2110,0x2ffe,0x2110,0x3fff,0x2040,
-@@ -4178,7 +4178,7 @@
- 0x1020,0x1020,0x17ff,0x5020,0x59fc,0x5524,0xd524,0x9124,
- 0x11fc,0x10a8,0x10a8,0x11ac,0x1124,0x1326,0x1623,0x1020
- };
--unsigned short font58[]={
-+const unsigned short font58[]={
- 0x1020,0x1122,0x11a6,0x50a4,0x5820,0x55fe,0xd502,0x9102,
- 0x11fe,0x1102,0x1102,0x11fe,0x1102,0x1102,0x1102,0x110e,
- 0x2080,0x2184,0x2104,0x27fe,0xb092,0xa990,0xa31f,0xa680,
-@@ -4368,7 +4368,7 @@
- 0x0000,0xffff,0x0100,0x1ff8,0x1008,0x1ff8,0x1008,0x1ff8,
- 0x1008,0x1ff8,0x0204,0xffff,0x0120,0x00c1,0x0733,0x780e
- };
--unsigned short font59[]={
-+const unsigned short font59[]={
- 0xffff,0x0100,0x1ff8,0x1008,0x1ff8,0x1008,0x1ff8,0x1008,
- 0xffff,0x8041,0x8221,0x3ffc,0x0210,0x0162,0x07c6,0x7c3c,
- 0x2214,0x2216,0xff92,0x2210,0x3e1f,0x22f0,0x3e12,0x2212,
-@@ -4558,7 +4558,7 @@
- 0x2024,0x2022,0x27ff,0x2420,0xfdf2,0x2416,0x25dc,0x2548,
- 0x3ddd,0xe437,0x28e2,0x2000,0x22a6,0x2293,0x2685,0x6c7c
- };
--unsigned short font5a[]={
-+const unsigned short font5a[]={
- 0x2040,0x207e,0x2040,0x27ff,0xfc41,0x25f8,0x2442,0x243e,
- 0x3c00,0xe7ff,0x2440,0x25a2,0x2454,0x25b8,0x2854,0x63b3,
- 0x2020,0x2050,0x2088,0xf924,0x26fb,0x2154,0x2124,0x2154,
-@@ -4748,7 +4748,7 @@
- 0x4920,0x2a20,0x083f,0x7f64,0x49c4,0x5d28,0x6b10,0x492c,
- 0x4b43,0x0000,0x1ff8,0x1008,0x1ff8,0x1008,0x1008,0x1ff8
- };
--unsigned short font5b[]={
-+const unsigned short font5b[]={
- 0x0088,0x0088,0xf7ff,0x9088,0x93fe,0x9124,0x9124,0xf7ff,
- 0x9124,0x9124,0x93fe,0x9020,0xf020,0x07ff,0x0020,0x0020,
- 0x0040,0x0040,0xf7ff,0x9088,0x928a,0x9104,0x93fe,0xf505,
diff --git a/japanese/kbanner/patches/patch-ae b/japanese/kbanner/patches/patch-ae
deleted file mode 100644
index a847f113cc5..00000000000
--- a/japanese/kbanner/patches/patch-ae
+++ /dev/null
@@ -1,226 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2000/05/18 09:08:10 itohy Exp $
-
---- font3.c.orig Fri Oct 15 14:18:55 1993
-+++ font3.c Thu May 18 00:27:03 2000
-@@ -1,4 +1,4 @@
--unsigned short font5c[]={
-+const unsigned short font5c[]={
- 0x100e,0x11f8,0x1110,0xfd10,0x11ff,0x1908,0x3508,0x31c5,
- 0x3303,0x51fe,0x5102,0x9102,0x11fe,0x1102,0x1102,0x11fe,
- 0x1048,0x1044,0x107e,0xfde0,0x1036,0x1018,0x386d,0x3587,
-@@ -188,7 +188,7 @@
- 0x2020,0x2020,0x27ff,0xf924,0x2124,0x32aa,0x6820,0x67ff,
- 0xa000,0xa3fe,0x2202,0x22fa,0x228a,0x22fa,0x2202,0x23fe
- };
--unsigned short font5d[]={
-+const unsigned short font5d[]={
- 0x0010,0x3e10,0x22fe,0x2244,0x3e28,0x20ff,0x7e10,0x52fe,
- 0xd210,0x1e10,0x0100,0xffff,0x0540,0x0d60,0x3938,0xe10f,
- 0x0420,0xffff,0x0420,0x0010,0x3efe,0x2244,0x3e28,0x20fe,
-@@ -378,7 +378,7 @@
- 0x0020,0x6020,0x3020,0x1020,0x003f,0xc020,0x6020,0x2020,
- 0x0020,0x13fe,0x1202,0x3202,0x2202,0x6202,0x4202,0xc3fe
- };
--unsigned short font5e[]={
-+const unsigned short font5e[]={
- 0x0000,0x67fe,0x3442,0x1442,0x0442,0xc442,0x6442,0x27fe,
- 0x0442,0x1442,0x1442,0x3442,0x2442,0x6442,0x47fe,0xc000,
- 0x0006,0x603c,0x37e0,0x1040,0x0040,0xc040,0x67fe,0x2002,
-@@ -568,7 +568,7 @@
- 0x0240,0x4240,0x66ff,0x2484,0x0dcc,0x8a78,0xda10,0x4a7c,
- 0x0bc7,0x0a10,0x2bff,0x2a54,0x6a54,0x48d6,0x4993,0xc810
- };
--unsigned short font5f[]={
-+const unsigned short font5f[]={
- 0x0104,0x6088,0x33fe,0x1020,0x01fc,0xc020,0x67ff,0x2040,
- 0x0030,0x13e2,0x1026,0x37b4,0x20a8,0x6124,0x4623,0xc0e0,
- 0x0020,0x6020,0x37ff,0x1000,0x0154,0xc124,0x6154,0x2104,
-@@ -758,7 +758,7 @@
- 0x1010,0x10fe,0x1012,0x15ff,0x5412,0x54fe,0xd010,0x91ff,
- 0x10aa,0x1129,0x3800,0x28fe,0x2caa,0x64aa,0x40aa,0xc1ff
- };
--unsigned short font60[]={
-+const unsigned short font60[]={
- 0x0000,0xfe7f,0x1008,0x2211,0xd46a,0x2814,0xdc6e,0x2a15,
- 0xc864,0x391c,0x0100,0x138c,0x32d8,0x2660,0x1c38,0xf00f,
- 0x2000,0x23de,0x2042,0x2bde,0xa842,0xabde,0xa088,0xa110,
-@@ -948,7 +948,7 @@
- 0x0041,0x0263,0xfb22,0x2126,0x2104,0x2000,0x2040,0xf840,
- 0x27ff,0x2084,0x2184,0x210c,0x39e8,0xe03c,0x00e6,0x0383
- };
--unsigned short font61[]={
-+const unsigned short font61[]={
- 0x1006,0x101c,0xfef4,0x2884,0x2ca4,0x66a4,0xc3a4,0x3ca4,
- 0x00a4,0xffa4,0x20a4,0x7ea4,0x02a6,0x02aa,0x06ba,0x1d6b,
- 0x2034,0x27e4,0xfc3f,0x552a,0x552a,0x552a,0xfd3f,0x2524,
-@@ -1138,7 +1138,7 @@
- 0x0080,0x0080,0x3fff,0xa540,0x6a8a,0x254a,0x201f,0x2fb4,
- 0x6894,0xaf9f,0x2014,0x6f94,0x4a9f,0xcf94,0x0854,0x07df
- };
--unsigned short font62[]={
-+const unsigned short font62[]={
- 0x0080,0x3fff,0x2200,0xafbf,0x6208,0x2fbe,0x28a2,0x2fbe,
- 0x68a2,0xafbe,0x28a2,0x6fa2,0x403e,0xdfd4,0x0936,0x10a3,
- 0x0000,0x0000,0x0000,0x0000,0x7fc8,0x0250,0x4662,0x2c34,
-@@ -1328,7 +1328,7 @@
- 0x0800,0xffbc,0x0824,0x7f47,0x0000,0x7f7c,0x4924,0x7f18,
- 0x40e7,0x8000,0x7ffe,0x0400,0x0ffc,0x3804,0xe804,0x0ffc
- };
--unsigned short font63[]={
-+const unsigned short font63[]={
- 0x0020,0xfbfe,0x2020,0x21fc,0x2020,0x27ff,0x7800,0x49fc,
- 0xc904,0x49fc,0x4904,0x49fc,0x4904,0x79fc,0x0088,0x0306,
- 0x0020,0xfc20,0x23ff,0x2020,0x21fe,0x2122,0x79fe,0x4922,
-@@ -1518,7 +1518,7 @@
- 0x1040,0x1040,0x3eff,0x6990,0xc408,0x3ffe,0x2000,0x27fc,
- 0x2040,0x2040,0x23f8,0x2040,0x2040,0x2ffe,0x2000,0x3ffe
- };
--unsigned short font64[]={
-+const unsigned short font64[]={
- 0x1040,0x1040,0x3eff,0x6990,0xc408,0x3ffe,0x2000,0x27fc,
- 0x2040,0x23f8,0x2040,0x2050,0x2048,0x2ffe,0x2000,0x3ffe,
- 0x1040,0x1040,0x3eff,0x69a0,0xc410,0x0000,0x7ffe,0x0420,
-@@ -1708,7 +1708,7 @@
- 0x1000,0x30fe,0x6010,0xc410,0x6c10,0x1810,0x3010,0x65ff,
- 0xfe10,0x1210,0x1010,0x5410,0x5610,0xd210,0x9010,0x1070
- };
--unsigned short font65[]={
-+const unsigned short font65[]={
- 0x1004,0x3004,0x6004,0xc404,0x6cff,0x1804,0x3004,0x6444,
- 0xfe64,0x1224,0x1004,0x5404,0x5604,0xd204,0x9004,0x101c,
- 0x1000,0x30fe,0x6000,0xc400,0x6c00,0x1800,0x31ff,0x6420,
-@@ -1898,7 +1898,7 @@
- 0x2020,0x2020,0x7c20,0xd1fc,0x1024,0x1024,0xfe24,0x1024,
- 0x11ff,0x5450,0x5450,0x5458,0x54c8,0x7c8c,0x0186,0x0303
- };
--unsigned short font66[]={
-+const unsigned short font66[]={
- 0x4020,0x403e,0xf820,0xa3ff,0x2221,0x223c,0xfae1,0x223f,
- 0x2204,0xaa78,0xaa92,0xaa54,0xabff,0xfa10,0x0410,0x0070,
- 0x0000,0x7e7e,0x4242,0x7e7e,0x4242,0x7e7e,0x4242,0x7e7e,
-@@ -2088,7 +2088,7 @@
- 0x0020,0x7820,0x4fff,0x4890,0x4890,0x799e,0x4912,0x4b32,
- 0x4d2a,0x7966,0x4914,0x491c,0x4908,0x491c,0xc936,0x9963
- };
--unsigned short font67[]={
-+const unsigned short font67[]={
- 0x0020,0x7c20,0x45ff,0x4c40,0x48fe,0x5b10,0x50ff,0x4800,
- 0x44fe,0x4482,0x44fe,0x4482,0x5cfe,0x4082,0x4082,0x408e,
- 0x0050,0x7850,0x4850,0x49fc,0x4954,0x7954,0x4954,0x49fc,
-@@ -2278,7 +2278,7 @@
- 0x0810,0x0810,0xffff,0x0810,0x0810,0x0100,0x0100,0x7ffe,
- 0x0000,0x0810,0x0c30,0x0420,0x0460,0x0040,0xffff,0x0000
- };
--unsigned short font68[]={
-+const unsigned short font68[]={
- 0x0810,0x0810,0xffff,0x0810,0x0000,0x7ffe,0x4002,0x4102,
- 0x4ff2,0x4102,0x4382,0x42c2,0x4662,0x4c32,0x4002,0x7ffe,
- 0x0810,0x0810,0xffff,0x0810,0x0000,0x7ffe,0x4002,0x4002,
-@@ -2468,7 +2468,7 @@
- 0x0420,0xffff,0x0420,0x0000,0x7ffe,0x0440,0x3ffc,0x2444,
- 0x3ffc,0x1008,0x1ff8,0x1008,0x1ff8,0x0100,0xffff,0x0100
- };
--unsigned short font69[]={
-+const unsigned short font69[]={
- 0x0420,0xffff,0x0420,0x1ff8,0x0008,0x1ff8,0x0008,0x1ff8,
- 0x0000,0x7cfe,0x1082,0xfefe,0x0008,0xffff,0x0808,0x0438,
- 0x0420,0xffff,0x0420,0x0100,0x1288,0x1224,0x23e0,0x0810,
-@@ -2658,7 +2658,7 @@
- 0x2000,0x21ff,0x2000,0xfcfe,0xa482,0xa482,0xa4fe,0xa480,
- 0xfcff,0x20a9,0x21a9,0x29ff,0x2aa9,0x3ca9,0xe4a9,0x00ab
- };
--unsigned short font6a[]={
-+const unsigned short font6a[]={
- 0x2020,0x2070,0x20d8,0xf98c,0xaf77,0xa800,0xabc2,0xaa52,
- 0xaa52,0xfbd2,0x2252,0x2a52,0x2bc2,0x7a42,0xca42,0x02ce,
- 0x2108,0x2108,0x2108,0xffdf,0xaa30,0xaa00,0xaa1f,0xabc2,
-@@ -2848,7 +2848,7 @@
- 0x0008,0x3f7f,0x2122,0x3f14,0x207f,0x7f08,0x517f,0xd108,
- 0x1f08,0x0080,0xffff,0x0244,0x0c68,0xf830,0x0f9c,0x3807
- };
--unsigned short font6b[]={
-+const unsigned short font6b[]={
- 0x2000,0x21fe,0x2020,0xfbff,0x0a21,0x1bad,0x3221,0x21ac,
- 0x6800,0xb3ff,0x2820,0x23ff,0x2249,0x2249,0x2249,0x224b,
- 0x2004,0x23e4,0x2284,0xfa8f,0x0be8,0x1a20,0x33e0,0x228f,
-@@ -3038,7 +3038,7 @@
- 0x0078,0x7890,0x03ff,0xfd24,0x01c7,0x793c,0x0100,0x01ff,
- 0x7900,0x013c,0x0100,0x793c,0x4900,0x497e,0x4a42,0x787e
- };
--unsigned short font6c[]={
-+const unsigned short font6c[]={
- 0x787c,0x0044,0xfc44,0x007c,0x0000,0x79ef,0x0129,0x0129,
- 0x79ef,0x0010,0x01ff,0x7854,0x4854,0x48d6,0x4993,0x7810,
- 0x3e10,0x22fe,0x3e44,0x20ff,0x7e10,0x52fe,0xd210,0x1e10,
-@@ -3228,7 +3228,7 @@
- 0x0006,0x7c1c,0x44f1,0x451b,0x458a,0x44a0,0x7c48,0x1090,
- 0x5064,0x5c3e,0x51e3,0x5010,0x51ff,0x5c28,0x7044,0xc183
- };
--unsigned short font6d[]={
-+const unsigned short font6d[]={
- 0x0100,0x7ffe,0x4422,0x5ffa,0x0420,0x1ff8,0x0420,0xffff,
- 0x0810,0x3ffc,0xe817,0x0ff0,0x0480,0x0efc,0x3b80,0xe0ff,
- 0x0084,0x7c48,0x45fe,0x4420,0x4420,0x44fc,0x7c20,0x1020,
-@@ -3418,7 +3418,7 @@
- 0x0104,0x618c,0x3088,0x13fe,0x0088,0x0088,0x0088,0xf7ff,
- 0x1088,0x1088,0x1088,0x1188,0x1108,0x3308,0x6800,0xc7ff
- };
--unsigned short font6e[]={
-+const unsigned short font6e[]={
- 0x0000,0x63fc,0x3204,0x13fc,0x0204,0x03fc,0x0080,0xf1fe,
- 0x1302,0x1622,0x13c2,0x1212,0x11f6,0x300c,0x6800,0xc7ff,
- 0x0000,0x479e,0x6482,0x2482,0x0482,0x079e,0x0400,0xe43e,
-@@ -3608,7 +3608,7 @@
- 0x1000,0x39ff,0x2d01,0x6511,0x4111,0xfd7d,0x1111,0x1111,
- 0xfd7d,0x1145,0x9545,0xd545,0x517d,0x1d01,0x71ff,0xc000
- };
--unsigned short font6f[]={
-+const unsigned short font6f[]={
- 0x1092,0x3892,0x2d24,0x6524,0x4092,0xfc92,0x1000,0x10fe,
- 0xfc92,0x1092,0x9492,0xd4fe,0x5092,0x1c92,0x7092,0xc0fe,
- 0x1048,0x3844,0x2c7e,0x65e0,0x4036,0xfc18,0x106d,0x1187,
-@@ -3798,7 +3798,7 @@
- 0x0024,0x7c64,0x45c4,0x4c44,0x49ff,0x5844,0x5044,0x48c4,
- 0x4584,0x4420,0x4420,0x5dfe,0x4020,0x4020,0x43ff,0x4000
- };
--unsigned short font70[]={
-+const unsigned short font70[]={
- 0x0010,0x7c10,0x45ff,0x4c10,0x4996,0x5892,0x5092,0x4955,
- 0x4555,0x4438,0x4428,0x4428,0x5c6c,0x4044,0x40c6,0x4183,
- 0x0010,0x7c90,0x449e,0x4c90,0x4890,0x5bff,0x5010,0x4854,
-@@ -3988,7 +3988,7 @@
- 0x087f,0x2f08,0x283e,0xffa2,0x493e,0x88a2,0x3a3e,0x0422,
- 0x1ffe,0xf10b,0x1ff8,0x1108,0x1ff8,0x0420,0xffff,0x0020
- };
--unsigned short font71[]={
-+const unsigned short font71[]={
- 0x0800,0x0f7f,0x0808,0x7fbe,0x48a2,0x7e22,0x48be,0x5fa2,
- 0x5522,0x5f3e,0x5522,0xffa2,0xaabe,0x2a94,0x7ff6,0x0023,
- 0x2200,0xff7f,0x2208,0x773e,0x5522,0x7722,0x003e,0x2422,
-@@ -4178,7 +4178,7 @@
- 0x3f04,0x2018,0x3e62,0x200c,0x3e31,0x2002,0xff8c,0x2230,
- 0x7d00,0x0000,0x0440,0x3ffc,0x2444,0x3ffc,0x2444,0x3ffc
- };
--unsigned short font72[]={
-+const unsigned short font72[]={
- 0x3f04,0x2018,0x3e62,0x200c,0xffb1,0x2206,0x7d38,0x0000,
- 0x0100,0xffff,0x0100,0x3ffc,0x0000,0x1ff8,0x1008,0x1ff8,
- 0x3f04,0x2018,0x3e62,0x200c,0x3e31,0x2002,0xff8c,0x2230,
-@@ -4368,7 +4368,7 @@
- 0x0010,0xff20,0x24fe,0x2482,0x3cfe,0x2482,0x24fe,0x2480,
- 0x3cff,0x2480,0x24ff,0x2401,0x3d55,0xe555,0x0603,0x0406
- };
--unsigned short font73[]={
-+const unsigned short font73[]={
- 0x1408,0x3610,0xe57e,0x2442,0x247e,0xffc2,0x247e,0x2540,
- 0x257f,0x3640,0x667f,0xa401,0x2c55,0x3555,0x2703,0x6206,
- 0x7c58,0x1044,0xffff,0x1022,0x7e34,0x1099,0x712f,0x0ff0,
-@@ -4558,7 +4558,7 @@
- 0x0100,0x07c0,0x1c78,0xf7cf,0x0000,0x7bde,0x4a52,0x7bde,
- 0x0000,0x3ffc,0x2444,0x2444,0x3ffc,0x2444,0x2444,0x244c
- };
--unsigned short font74[]={
-+const unsigned short font74[]={
- 0x0100,0x1ff8,0x0100,0x7ffe,0x0000,0x0810,0x7f7e,0x0810,
- 0x1f10,0xf0ff,0x0000,0x7ffe,0x0820,0x1821,0x3033,0xe01e,
- 0x1086,0x10fc,0x1081,0xfc7f,0x1000,0x117e,0x3942,0x357e,
diff --git a/japanese/kbanner/patches/patch-af b/japanese/kbanner/patches/patch-af
deleted file mode 100644
index 921d3396826..00000000000
--- a/japanese/kbanner/patches/patch-af
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-af,v 1.2 2000/05/18 22:47:25 itohy Exp $
-
-JIS X0208-1990 characters.
-
---- font3.c.orig Thu May 18 00:27:03 2000
-+++ font3.c Thu May 18 01:07:05 2000
-@@ -4567,10 +4567,10 @@
- 0x1320,0x1020,0x17ff,0x1020,0x1222,0x33fe,0x6800,0xc7ff,
- 0x0020,0x007c,0xf8c4,0x23ac,0x2058,0x2030,0xf8e0,0x2380,
- 0x20fe,0x2120,0x2020,0x3bff,0xe020,0x0122,0x0122,0x01fe,
-- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
-- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
-- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
-- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
-+ 0x0020,0x67ff,0x3000,0x13fe,0x0202,0x02fa,0x028a,0x02fa,
-+ 0x1202,0x13fe,0x3018,0x21e0,0x6020,0x47ff,0xc0a8,0x0326,
-+ 0x0000,0x7f7e,0x4442,0x4442,0x5f42,0x5142,0x517e,0x5140,
-+ 0x5f40,0x4441,0x4463,0x7f3e,0x0000,0x2444,0x6666,0xc223,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
- 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
diff --git a/japanese/kinput2/DESCR b/japanese/kinput2/DESCR
deleted file mode 100644
index 3e7fe7526dd..00000000000
--- a/japanese/kinput2/DESCR
+++ /dev/null
@@ -1,12 +0,0 @@
-Kinput2 is an input server for X11 applications that want Japanese
-text input.
-
-A client that wants kana-kanji conversion service for Japanese text
-sends a request to kinput2. Kinput2 receives the request, does
-kana-kanji conversion, and sends the converted text back to the
-client.
-
-The port supports Wnn4. Egg key binding is available,
-if you run
-
-kinput2 -ccdef ccdef.kinput2.egg
diff --git a/japanese/kinput2/MESSAGE b/japanese/kinput2/MESSAGE
deleted file mode 100644
index 72b48d9bf60..00000000000
--- a/japanese/kinput2/MESSAGE
+++ /dev/null
@@ -1,9 +0,0 @@
-======================================================================
-$NetBSD: MESSAGE,v 1.1 2001/10/31 23:29:17 zuntum Exp $
-
-If you want to use Egg key binding on kinput2, then
-you should run
-
-kinput2 -ccdef ccdef.kinput2.egg
-
-======================================================================
diff --git a/japanese/kinput2/Makefile b/japanese/kinput2/Makefile
deleted file mode 100644
index 8f5835655d7..00000000000
--- a/japanese/kinput2/Makefile
+++ /dev/null
@@ -1,58 +0,0 @@
-# $NetBSD: Makefile,v 1.9 2002/04/05 23:44:41 wiz Exp $
-# FreeBSD Id: Makefile,v 1.4 1999/06/06 13:19:49 taoka Exp $
-
-DISTNAME= kinput2-v3
-PKGNAME= kinput2-3.0
-CATEGORIES= japanese
-MASTER_SITES= ftp://ftp.sra.co.jp/pub/x11/kinput2/
-
-MAINTAINER= tech-pkg-ja@jp.netbsd.org
-COMMENT= Input server of Japanese text
-
-USE_IMAKE= YES
-
-PLIST_SRC= ${PKGDIR}/PLIST-common
-
-.include "../../mk/bsd.prefs.mk"
-.if defined(USE_CANNA) && ${USE_CANNA} != YES && \
- defined(USE_WNN4) && ${USE_WNN4} != YES && \
- defined(USE_WNN6) && ${USE_WNN6} != YES && \
- defined(USE_SJ3) && ${USE_SJ3} != YES
-IGNORE= ${PKGNAME} is ignored. because USE_CANNA,USE_WNN4,USE_WNN6,USE_SJ3 are "NO"
-.endif
-
-.if !defined(USE_CANNA) || ${USE_CANNA} == YES
-DEPENDS+= Canna-lib>=3.5.2:../../japanese/canna-lib
-KINPUT2_DEF+= -DUseCanna -Dport_CANNASRC=${LOCALBASE}/include \
- -Dport_CANNALIB="${LDFLAGS} -lcanna16"
-.endif
-
-#.if defined(USE_WNN6) && ${USE_WNN6} == YES
-#DEPENDS+=
-#KINPUT2_DEF+= -DUseWnn -DUseWnn6 -Dport_WNNINCDIR=${LOCALBASE}/include/wnn \
-# -Dport_WNNLIB="${LDFLAGS} -lwnn6 -lcrypt"
-#.elif (!defined(USE_WNN4) || ${USE_WNN4} == YES)
-.if !defined(USE_WNN4) || ${USE_WNN4} == YES
-DEPENDS+= ja-FreeWnn-lib-1.10:../../japanese/freewnn-lib
-KINPUT2_DEF+= -DUseWnn -Dport_WNNINCDIR=${LOCALBASE}/include/wnn \
- -Dport_WNNLIB="${LDFLAGS} -lwnn -lcrypt"
-PLIST_SRC+= ${PKGDIR}/PLIST-freewnn
-.endif
-
-.if !defined(USE_SJ3) || ${USE_SJ3} == YES
-DEPENDS+= sj3-lib-2.0.1.20:../../japanese/sj3-lib
-KINPUT2_DEF+= -DUseSj3 -Dport_SJ3SRC=${LOCALBASE}/include \
- -Dport_SJ3LIB="${LDFLAGS} -lsj3lib"
-PLIST_SRC+= ${PKGDIR}/PLIST-sj3
-.endif
-
-MAKE_ENV+= PORT_IMAKE_DEFINES='${KINPUT2_DEF}'
-
-pre-configure:
- ${MV} -f ${WRKSRC}/Kinput2.conf ${WRKSRC}/Kinput2.conf.org
- ${CP} ${FILESDIR}/Kinput2.conf ${WRKSRC}/Kinput2.conf
-
-do-configure:
- cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${XMKMF}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/japanese/kinput2/PLIST-common b/japanese/kinput2/PLIST-common
deleted file mode 100644
index 18aa215235a..00000000000
--- a/japanese/kinput2/PLIST-common
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST-common,v 1.1 2001/10/31 23:31:33 zuntum Exp $
-bin/kinput2
-lib/X11/app-defaults/Kinput2
-man/cat1/kinput2.0
diff --git a/japanese/kinput2/PLIST-freewnn b/japanese/kinput2/PLIST-freewnn
deleted file mode 100644
index 06be10b514d..00000000000
--- a/japanese/kinput2/PLIST-freewnn
+++ /dev/null
@@ -1,15 +0,0 @@
-@comment $NetBSD: PLIST-freewnn,v 1.1 2001/10/31 23:31:34 zuntum Exp $
-lib/X11/ccdef/ccdef.kinput2
-lib/X11/ccdef/rule.eggfunc
-lib/X11/ccdef/rule.func
-lib/X11/ccdef/rule.greek
-lib/X11/ccdef/rule.kana
-lib/X11/ccdef/rule.kana2
-lib/X11/ccdef/rule.roma
-lib/X11/ccdef/rule.wnnroma
-lib/X11/ccdef/rule.zascii
-lib/X11/ccdef/ccdef.kinput2.egg
-lib/X11/ccdef/rule.hiragana.egg
-lib/X11/ccdef/rule.katakana.egg
-lib/X11/ccdef/rule.kigou.egg
-@dirrm lib/X11/ccdef
diff --git a/japanese/kinput2/PLIST-sj3 b/japanese/kinput2/PLIST-sj3
deleted file mode 100644
index 486b0cc7c5b..00000000000
--- a/japanese/kinput2/PLIST-sj3
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST-sj3,v 1.1 2001/10/31 23:31:34 zuntum Exp $
-lib/X11/sj3def/sjhk
-lib/X11/sj3def/sjrc
-lib/X11/sj3def/sjrk
-lib/X11/sj3def/sjsb
-lib/X11/sj3def/sjzh
-@dirrm lib/X11/sj3def
diff --git a/japanese/kinput2/distinfo b/japanese/kinput2/distinfo
deleted file mode 100644
index 17a423d600a..00000000000
--- a/japanese/kinput2/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 10:13:33 wiz Exp $
-
-SHA1 (kinput2-v3.tar.gz) = a9e2be1fe4da4c5f4921a1d753f58d20f1ef3693
-Size (kinput2-v3.tar.gz) = 462281 bytes
-SHA1 (patch-aa) = c41b2baa5de117c031c266afbff0e947340ab708
diff --git a/japanese/kinput2/files/Kinput2.conf b/japanese/kinput2/files/Kinput2.conf
deleted file mode 100644
index c7c714ad1da..00000000000
--- a/japanese/kinput2/files/Kinput2.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-XCOMM Each parameter in this file is explained in the original
-XCOMM Kinput2.conf (probably Kinput2.conf.org)
-
-XCOMM Redefine $(IMAKE_CMD) for FreeBSD ports (by S. Taoka)
-
-IMAKE_CMD = $(IMAKE) -DUseInstalled -I$(IRULESRC) $(IMAKE_DEFINES) $(PORT_IMAKE_DEFINES)
-
-CCDEF_DIR = $(LIBDIR)/ccdef
-
-WNNSRC = port_WNNSRC
-WNNINCDIR = port_WNNINCDIR
-WNNLIB = port_WNNLIB
-
-CANNAINSTDIR = port_CANNAINSTDIR
-CANNASRC = port_CANNASRC
-CANNALIB = port_CANNALIB
-
-SJ3DEF_DIR = $(LIBDIR)/sj3def
-SJ3SRC = port_SJ3SRC
-SJ3LIB = port_SJ3LIB
-
-TRANSPORTDEFS =
diff --git a/japanese/kinput2/patches/patch-aa b/japanese/kinput2/patches/patch-aa
deleted file mode 100644
index 8baec40218a..00000000000
--- a/japanese/kinput2/patches/patch-aa
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-aa,v 1.1 1999/09/03 04:11:08 sakamoto Exp $
-
---- include/wnnlib.h.orig Thu May 27 08:55:22 1999
-+++ include/wnnlib.h Fri Sep 3 09:34:09 1999
-@@ -29,4 +29,5 @@
- #define _wnnlib_h
-
-+#include <config.h>
- #include <commonhd.h>
- #include <jllib.h>
diff --git a/japanese/less/DESCR b/japanese/less/DESCR
deleted file mode 100644
index a30c1ec1083..00000000000
--- a/japanese/less/DESCR
+++ /dev/null
@@ -1,11 +0,0 @@
- Less is a program similar to more (1), but which allows
- backward movement in the file as well as forward movement.
- Also, less does not have to read the entire input file
- before starting, so with large input files it starts up
- faster than text editors like vi (1).
-
- This enhanced less support ISO 2022 code extension techniqes and
-Japanese codes(EUC Japanese, SJIS) and compressed(or gzipped) file
-viewing. The author of this patch is jam@pobox.com. See
- http://www.pobox.com/~jam/less/
-for the latest info.
diff --git a/japanese/less/Makefile b/japanese/less/Makefile
deleted file mode 100644
index 5c63efb00f6..00000000000
--- a/japanese/less/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2001/07/29 14:10:06 taca Exp $
-# FreeBSD Id: Makefile,v 1.13 1998/07/17 20:36:13 steve Exp
-#
-
-DISTNAME= less-358
-PKGNAME= ja-${DISTNAME}
-CATEGORIES= japanese
-MASTER_SITES= ${MASTER_SITE_GNU:=less/}
-
-PATCH_SITES= http://www.io.com/~kazushi/less/
-PATCHFILES= less-358-iso254.patch.gz
-PATCH_DIST_STRIP= -p1
-
-MAINTAINER= komine@cc.meisei-u.ac.jp
-HOMEPAGE= http://www.io.com/~kazushi/less/
-COMMENT= less + zcat + ISO-2022 - a pager similar to more and pg
-
-GNU_CONFIGURE= yes
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/japanese/less/PLIST b/japanese/less/PLIST
deleted file mode 100644
index 3d9ef64b2bf..00000000000
--- a/japanese/less/PLIST
+++ /dev/null
@@ -1,6 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:29:17 zuntum Exp $
-bin/jless
-bin/jlesskey
-bin/jlessecho
-man/man1/jless.1
-man/man1/jlesskey.1
diff --git a/japanese/less/distinfo b/japanese/less/distinfo
deleted file mode 100644
index 383ae69e07c..00000000000
--- a/japanese/less/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.3 2001/07/29 14:10:06 taca Exp $
-
-SHA1 (less-358.tar.gz) = 1893ce820ef76686004c45364c559d1bd713ee73
-Size (less-358.tar.gz) = 231140 bytes
-SHA1 (less-358-iso254.patch.gz) = cb2df9fb8e66484d5e1544ae902fa87b1745fe70
-Size (less-358-iso254.patch.gz) = 71182 bytes
-SHA1 (patch-aa) = db51345c5db24ea57b24c250c092a8f28bd5e732
-SHA1 (patch-ab) = 6b30f10502e66680b2cee28dd3f7e822a58dd080
-SHA1 (patch-ac) = dc7fa429614fd0450128b6bbdb721e11e1b7bfc8
diff --git a/japanese/less/patches/patch-aa b/japanese/less/patches/patch-aa
deleted file mode 100644
index 07123fe8a06..00000000000
--- a/japanese/less/patches/patch-aa
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2001/07/29 14:10:06 taca Exp $
-
---- Makefile.in.orig Sun Jul 29 14:07:48 2001
-+++ Makefile.in
-@@ -22,11 +22,11 @@
-
- # Where the installed binary goes.
- bindir = @bindir@
--binprefix =
-+binprefix = j
-
- mandir = @mandir@
- manext = 1
--manprefix =
-+manprefix = j
-
- #### End of system configuration section. ####
-
diff --git a/japanese/less/patches/patch-ab b/japanese/less/patches/patch-ab
deleted file mode 100644
index e1ed47ee202..00000000000
--- a/japanese/less/patches/patch-ab
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2001/07/29 14:10:07 taca Exp $
-
---- configure.in.orig Sun Jul 29 14:07:49 2001
-+++ configure.in
-@@ -17,7 +17,6 @@
-
- dnl Checks for libraries.
- AC_CHECK_LIB(xcurses, initscr, [have_xcurses=yes], [have_xcurses=no])
--AC_CHECK_LIB(ncurses, initscr, [have_ncurses=yes], [have_ncurses=no])
- AC_CHECK_LIB(curses, initscr, [have_curses=yes], [have_curses=no])
- AC_CHECK_LIB(termcap, tgetent, [have_termcap=yes], [have_termcap=no])
- AC_CHECK_LIB(termlib, tgetent, [have_termlib=yes], [have_termlib=no])
-@@ -44,19 +43,6 @@
- if test "x$TERMLIBS" = x; then
- if test $have_xcurses = yes; then
- TERMLIBS="-lxcurses"
-- SAVE_LIBS=$LIBS
-- LIBS="$LIBS $TERMLIBS"
-- AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);],
-- [termok=yes], [termok=no])
-- LIBS=$SAVE_LIBS
-- if test $termok = no; then TERMLIBS=""; fi
-- fi
--fi
--
--dnl -- Try ncurses.
--if test "x$TERMLIBS" = x; then
-- if test $have_ncurses = yes; then
-- TERMLIBS="-lncurses"
- SAVE_LIBS=$LIBS
- LIBS="$LIBS $TERMLIBS"
- AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);],
diff --git a/japanese/less/patches/patch-ac b/japanese/less/patches/patch-ac
deleted file mode 100644
index 7b06143cc77..00000000000
--- a/japanese/less/patches/patch-ac
+++ /dev/null
@@ -1,87 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2001/07/29 14:10:07 taca Exp $
-
---- configure.orig Sun Jul 29 14:07:49 2001
-+++ configure
-@@ -973,47 +973,6 @@
- have_xcurses=no
- fi
-
--echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6
--echo "configure:978: checking for initscr in -lncurses" >&5
--ac_lib_var=`echo ncurses'_'initscr | sed 'y%./+-%__p_%'`
--if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-- echo $ac_n "(cached) $ac_c" 1>&6
--else
-- ac_save_LIBS="$LIBS"
--LIBS="-lncurses $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 986 "configure"
--#include "confdefs.h"
--/* Override any gcc2 internal prototype to avoid an error. */
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char initscr();
--
--int main() {
--initscr()
--; return 0; }
--EOF
--if { (eval echo configure:997: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-- rm -rf conftest*
-- eval "ac_cv_lib_$ac_lib_var=yes"
--else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- eval "ac_cv_lib_$ac_lib_var=no"
--fi
--rm -f conftest*
--LIBS="$ac_save_LIBS"
--
--fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-- echo "$ac_t""yes" 1>&6
-- have_ncurses=yes
--else
-- echo "$ac_t""no" 1>&6
--have_ncurses=no
--fi
--
- echo $ac_n "checking for initscr in -lcurses""... $ac_c" 1>&6
- echo "configure:1019: checking for initscr in -lcurses" >&5
- ac_lib_var=`echo curses'_'initscr | sed 'y%./+-%__p_%'`
-@@ -1298,34 +1257,6 @@
- LIBS="$LIBS $TERMLIBS"
- cat > conftest.$ac_ext <<EOF
- #line 1301 "configure"
--#include "confdefs.h"
--
--int main() {
--tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);
--; return 0; }
--EOF
--if { (eval echo configure:1308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-- rm -rf conftest*
-- termok=yes
--else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- termok=no
--fi
--rm -f conftest*
-- LIBS=$SAVE_LIBS
-- if test $termok = no; then TERMLIBS=""; fi
-- fi
--fi
--
--if test "x$TERMLIBS" = x; then
-- if test $have_ncurses = yes; then
-- TERMLIBS="-lncurses"
-- SAVE_LIBS=$LIBS
-- LIBS="$LIBS $TERMLIBS"
-- cat > conftest.$ac_ext <<EOF
--#line 1329 "configure"
- #include "confdefs.h"
-
- int main() {
diff --git a/japanese/man/DESCR b/japanese/man/DESCR
deleted file mode 100644
index ba31cae4147..00000000000
--- a/japanese/man/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-Japanese on-line manual pages of NetBSD, and
-jman to format and display pages including Japanese code correctly.
-
-Translated by "NetBSD Japanese online manuals TEAM".
-If you have any comment, or if you will help this project,
-contact with <jman@spa.is.uec.ac.jp>,
-If you find any bug, contact with <jman-bugs@spa.is.uec.ac.jp>.
diff --git a/japanese/man/MESSAGE b/japanese/man/MESSAGE
deleted file mode 100644
index 713a13acbab..00000000000
--- a/japanese/man/MESSAGE
+++ /dev/null
@@ -1,6 +0,0 @@
-======================================================================
-$NetBSD: MESSAGE,v 1.1 2001/10/31 23:29:18 zuntum Exp $
-
-Please read ${PREFIX}/share/doc/jman/README.
-
-======================================================================
diff --git a/japanese/man/Makefile b/japanese/man/Makefile
deleted file mode 100644
index dd871765b51..00000000000
--- a/japanese/man/Makefile
+++ /dev/null
@@ -1,73 +0,0 @@
-# $NetBSD: Makefile,v 1.10 2002/03/31 05:23:48 taca Exp $
-
-DISTNAME= NetBSD1.3I-jman-19990531
-PKGNAME= ja-man-19990531
-CATEGORIES= japanese
-MASTER_SITES= ftp://ftp.spa.is.uec.ac.jp/pub/NetBSD/jman/archives/
-
-MAINTAINER= sakamoto@netbsd.org
-HOMEPAGE= ftp://ftp.spa.is.uec.ac.jp/pub/NetBSD/jman/index.html
-COMMENT= Japanese on-line manual pages of NetBSD
-
-DEPENDS= ja-less>=332:../../japanese/less
-DEPENDS+= ja-groff-0.99:../../japanese/groff
-
-JAMANDIR= ja_JP.EUC
-PLIST_SUBST+= JAMANDIR=${JAMANDIR}
-MAKE_ENV+= JAMANDIR=${JAMANDIR}
-
-PLIST_SRC= ${WRKDIR}/PLIST
-
-MANCOMPRESSED_IF_MANZ= yes
-
-.include "../../mk/bsd.prefs.mk"
-
-post-extract:
- @${GTAR} cCf ${PREFIX}/share/groff/tmac - tmac.andoc tmac.doc \
- mdoc/doc-common mdoc/doc-ditroff mdoc/doc-nroff mdoc/doc-syms | \
- ${GTAR} xCf ${WRKSRC} -
-
-post-patch:
- @${PATCH} -s -p2 -d ${WRKSRC}/mdoc < \
- ${WRKSRC}/jgroff-for-netbsd-jman.dif
-
-do-build:
- @${SED} -e 's|$${BINDIR}|${PREFIX}/bin|g' \
- -e 's|$${JMANCONFDIR}|${PREFIX}/etc|g' ${WRKSRC}/jman/jman.sh \
- > ${WRKSRC}/jman/jman
- @${SED} -e 's|$${PREFIX}|${PREFIX}|g' \
- -e 's|$${LOCALBASE}|${LOCALBASE}|g' \
- -e 's|$${X11BASE}|${X11BASE}|g' \
- -e 's|$${JAMANDIR}|${JAMANDIR}|g' \
- ${WRKSRC}/jman/jman.conf \
- > ${WRKSRC}/jman/jman.conf.t
-
-MKCATPAGES?= yes
-
-pre-install:
-.if ${MKCATPAGES} == no
- @${SED} -e '/\/cat[1-9]\//d' ${PKGDIR}/PLIST > ${PLIST_SRC}
-.if exists(${PKGDIR}/PLIST.${MACHINE})
- @${SED} -e '/\/cat[1-9]\//d' ${PKGDIR}/PLIST.${MACHINE} >> ${PLIST_SRC}
-.endif
-.else
- @${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
-.if exists(${PKGDIR}/PLIST.${MACHINE})
- @${CAT} ${PKGDIR}/PLIST.${MACHINE} >> ${PLIST_SRC}
-.endif
-.endif
-
-do-install:
- for f in tmac.andoc tmac.doc \
- mdoc/doc-common mdoc/doc-ditroff mdoc/doc-nroff mdoc/doc-syms; do \
- ${INSTALL_DATA} ${WRKSRC}/$${f} \
- ${PREFIX}/share/groff/tmac/$${f}j; \
- done
- ${INSTALL_SCRIPT} ${WRKSRC}/jman/jman ${PREFIX}/bin
- ${INSTALL_DATA} ${WRKSRC}/jman/jman.conf.t ${PREFIX}/etc/jman.conf
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/jman
- ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/jman
- @(cd ${WRKSRC}/man; \
- ${MAKE} PREFIX='${PREFIX}' JAMANDIR='${JAMANDIR}' install)
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/japanese/man/PLIST b/japanese/man/PLIST
deleted file mode 100644
index 25015231054..00000000000
--- a/japanese/man/PLIST
+++ /dev/null
@@ -1,1613 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:29:18 zuntum Exp $
-bin/jman
-etc/jman.conf
-man/${JAMANDIR}/cat1/Mail.0
-man/${JAMANDIR}/cat1/[.0
-man/${JAMANDIR}/cat1/addftinfo.0
-man/${JAMANDIR}/cat1/alias.0
-man/${JAMANDIR}/cat1/apply.0
-man/${JAMANDIR}/cat1/apropos.0
-man/${JAMANDIR}/cat1/ar.0
-man/${JAMANDIR}/cat1/as.0
-man/${JAMANDIR}/cat1/asa.0
-man/${JAMANDIR}/cat1/at.0
-man/${JAMANDIR}/cat1/atq.0
-man/${JAMANDIR}/cat1/atrm.0
-man/${JAMANDIR}/cat1/audioctl.0
-man/${JAMANDIR}/cat1/awk.0
-man/${JAMANDIR}/cat1/banner.0
-man/${JAMANDIR}/cat1/basename.0
-man/${JAMANDIR}/cat1/batch.0
-man/${JAMANDIR}/cat1/bc.0
-man/${JAMANDIR}/cat1/bg.0
-man/${JAMANDIR}/cat1/biff.0
-man/${JAMANDIR}/cat1/bunzip2.0
-man/${JAMANDIR}/cat1/bzcat.0
-man/${JAMANDIR}/cat1/bzip2.0
-man/${JAMANDIR}/cat1/bzip2recover.0
-man/${JAMANDIR}/cat1/c++.0
-man/${JAMANDIR}/cat1/cal.0
-man/${JAMANDIR}/cat1/calendar.0
-man/${JAMANDIR}/cat1/cap_mkdb.0
-man/${JAMANDIR}/cat1/cat.0
-man/${JAMANDIR}/cat1/cc.0
-man/${JAMANDIR}/cat1/cc1.0
-man/${JAMANDIR}/cat1/cc1obj.0
-man/${JAMANDIR}/cat1/cc1plus.0
-man/${JAMANDIR}/cat1/cccp.0
-man/${JAMANDIR}/cat1/cd.0
-man/${JAMANDIR}/cat1/checknr.0
-man/${JAMANDIR}/cat1/chflags.0
-man/${JAMANDIR}/cat1/chfn.0
-man/${JAMANDIR}/cat1/chgrp.0
-man/${JAMANDIR}/cat1/chio.0
-man/${JAMANDIR}/cat1/chmod.0
-man/${JAMANDIR}/cat1/chpass.0
-man/${JAMANDIR}/cat1/chsh.0
-man/${JAMANDIR}/cat1/ci.0
-man/${JAMANDIR}/cat1/cksum.0
-man/${JAMANDIR}/cat1/clear.0
-man/${JAMANDIR}/cat1/cmp.0
-man/${JAMANDIR}/cat1/co.0
-man/${JAMANDIR}/cat1/col.0
-man/${JAMANDIR}/cat1/colcrt.0
-man/${JAMANDIR}/cat1/colrm.0
-man/${JAMANDIR}/cat1/column.0
-man/${JAMANDIR}/cat1/comm.0
-man/${JAMANDIR}/cat1/compress.0
-man/${JAMANDIR}/cat1/cp.0
-man/${JAMANDIR}/cat1/cpio.0
-man/${JAMANDIR}/cat1/cpp.0
-man/${JAMANDIR}/cat1/crontab.0
-man/${JAMANDIR}/cat1/csh.0
-man/${JAMANDIR}/cat1/ctags.0
-man/${JAMANDIR}/cat1/cu.0
-man/${JAMANDIR}/cat1/cut.0
-man/${JAMANDIR}/cat1/date.0
-man/${JAMANDIR}/cat1/dd.0
-man/${JAMANDIR}/cat1/df.0
-man/${JAMANDIR}/cat1/diff.0
-man/${JAMANDIR}/cat1/diff3.0
-man/${JAMANDIR}/cat1/dirname.0
-man/${JAMANDIR}/cat1/dirs.0
-man/${JAMANDIR}/cat1/dnsquery.0
-man/${JAMANDIR}/cat1/domainname.0
-man/${JAMANDIR}/cat1/du.0
-man/${JAMANDIR}/cat1/echo.0
-man/${JAMANDIR}/cat1/ed.0
-man/${JAMANDIR}/cat1/egrep.0
-man/${JAMANDIR}/cat1/eject.0
-man/${JAMANDIR}/cat1/env.0
-man/${JAMANDIR}/cat1/eqn.0
-man/${JAMANDIR}/cat1/error.0
-man/${JAMANDIR}/cat1/ex.0
-man/${JAMANDIR}/cat1/expand.0
-man/${JAMANDIR}/cat1/expr.0
-man/${JAMANDIR}/cat1/false.0
-man/${JAMANDIR}/cat1/fdformat.0
-man/${JAMANDIR}/cat1/fg.0
-man/${JAMANDIR}/cat1/fgrep.0
-man/${JAMANDIR}/cat1/file.0
-man/${JAMANDIR}/cat1/find.0
-man/${JAMANDIR}/cat1/finger.0
-man/${JAMANDIR}/cat1/flex.0
-man/${JAMANDIR}/cat1/fmt.0
-man/${JAMANDIR}/cat1/fold.0
-man/${JAMANDIR}/cat1/foreach.0
-man/${JAMANDIR}/cat1/fpr.0
-man/${JAMANDIR}/cat1/from.0
-man/${JAMANDIR}/cat1/fsplit.0
-man/${JAMANDIR}/cat1/fstat.0
-man/${JAMANDIR}/cat1/ftp.0
-man/${JAMANDIR}/cat1/g++.0
-man/${JAMANDIR}/cat1/gcc.0
-man/${JAMANDIR}/cat1/gcpp.0
-man/${JAMANDIR}/cat1/gdb.0
-man/${JAMANDIR}/cat1/gencat.0
-man/${JAMANDIR}/cat1/genclass.0
-man/${JAMANDIR}/cat1/getconf.0
-man/${JAMANDIR}/cat1/getopt.0
-man/${JAMANDIR}/cat1/gprof.0
-man/${JAMANDIR}/cat1/grep.0
-man/${JAMANDIR}/cat1/grodvi.0
-man/${JAMANDIR}/cat1/groff.0
-man/${JAMANDIR}/cat1/grog.0
-man/${JAMANDIR}/cat1/grops.0
-man/${JAMANDIR}/cat1/grotty.0
-man/${JAMANDIR}/cat1/groups.0
-man/${JAMANDIR}/cat1/gunzip.0
-man/${JAMANDIR}/cat1/gzcat.0
-man/${JAMANDIR}/cat1/gzexe.0
-man/${JAMANDIR}/cat1/gzip.0
-man/${JAMANDIR}/cat1/head.0
-man/${JAMANDIR}/cat1/hexdump.0
-man/${JAMANDIR}/cat1/history.0
-man/${JAMANDIR}/cat1/hostname.0
-man/${JAMANDIR}/cat1/id.0
-man/${JAMANDIR}/cat1/ident.0
-man/${JAMANDIR}/cat1/indent.0
-man/${JAMANDIR}/cat1/indxbib.0
-man/${JAMANDIR}/cat1/install.0
-man/${JAMANDIR}/cat1/intro.0
-man/${JAMANDIR}/cat1/ipcrm.0
-man/${JAMANDIR}/cat1/ipcs.0
-man/${JAMANDIR}/cat1/jobs.0
-man/${JAMANDIR}/cat1/join.0
-man/${JAMANDIR}/cat1/kdump.0
-man/${JAMANDIR}/cat1/kill.0
-man/${JAMANDIR}/cat1/ktrace.0
-man/${JAMANDIR}/cat1/lam.0
-man/${JAMANDIR}/cat1/last.0
-man/${JAMANDIR}/cat1/lastcomm.0
-man/${JAMANDIR}/cat1/ld.0
-man/${JAMANDIR}/cat1/ld.so.0
-man/${JAMANDIR}/cat1/ldd.0
-man/${JAMANDIR}/cat1/leave.0
-man/${JAMANDIR}/cat1/less.0
-man/${JAMANDIR}/cat1/lex.0
-man/${JAMANDIR}/cat1/limit.0
-man/${JAMANDIR}/cat1/lkbib.0
-man/${JAMANDIR}/cat1/ln.0
-man/${JAMANDIR}/cat1/locate.0
-man/${JAMANDIR}/cat1/lock.0
-man/${JAMANDIR}/cat1/logger.0
-man/${JAMANDIR}/cat1/login.0
-man/${JAMANDIR}/cat1/logname.0
-man/${JAMANDIR}/cat1/look.0
-man/${JAMANDIR}/cat1/lookbib.0
-man/${JAMANDIR}/cat1/lorder.0
-man/${JAMANDIR}/cat1/lpq.0
-man/${JAMANDIR}/cat1/lpr.0
-man/${JAMANDIR}/cat1/lprm.0
-man/${JAMANDIR}/cat1/lptest.0
-man/${JAMANDIR}/cat1/ls.0
-man/${JAMANDIR}/cat1/m4.0
-man/${JAMANDIR}/cat1/machine.0
-man/${JAMANDIR}/cat1/mail.0
-man/${JAMANDIR}/cat1/mailq.0
-man/${JAMANDIR}/cat1/mailx.0
-man/${JAMANDIR}/cat1/make.0
-man/${JAMANDIR}/cat1/man.0
-man/${JAMANDIR}/cat1/md5.0
-man/${JAMANDIR}/cat1/merge.0
-man/${JAMANDIR}/cat1/mesg.0
-man/${JAMANDIR}/cat1/mixerctl.0
-man/${JAMANDIR}/cat1/mkdep.0
-man/${JAMANDIR}/cat1/mkdir.0
-man/${JAMANDIR}/cat1/mkfifo.0
-man/${JAMANDIR}/cat1/mkstr.0
-man/${JAMANDIR}/cat1/more.0
-man/${JAMANDIR}/cat1/mset.0
-man/${JAMANDIR}/cat1/msgs.0
-man/${JAMANDIR}/cat1/mt.0
-man/${JAMANDIR}/cat1/mv.0
-man/${JAMANDIR}/cat1/neqn.0
-man/${JAMANDIR}/cat1/netstat.0
-man/${JAMANDIR}/cat1/newaliases.0
-man/${JAMANDIR}/cat1/nfsstat.0
-man/${JAMANDIR}/cat1/nice.0
-man/${JAMANDIR}/cat1/nm.0
-man/${JAMANDIR}/cat1/nohup.0
-man/${JAMANDIR}/cat1/nroff.0
-man/${JAMANDIR}/cat1/od.0
-man/${JAMANDIR}/cat1/page.0
-man/${JAMANDIR}/cat1/pagesize.0
-man/${JAMANDIR}/cat1/passwd.0
-man/${JAMANDIR}/cat1/paste.0
-man/${JAMANDIR}/cat1/patch.0
-man/${JAMANDIR}/cat1/pax.0
-man/${JAMANDIR}/cat1/pfbtops.0
-man/${JAMANDIR}/cat1/pic.0
-man/${JAMANDIR}/cat1/popd.0
-man/${JAMANDIR}/cat1/pr.0
-man/${JAMANDIR}/cat1/printenv.0
-man/${JAMANDIR}/cat1/printf.0
-man/${JAMANDIR}/cat1/ps.0
-man/${JAMANDIR}/cat1/psbb.0
-man/${JAMANDIR}/cat1/psroff.0
-man/${JAMANDIR}/cat1/pushd.0
-man/${JAMANDIR}/cat1/pwd.0
-man/${JAMANDIR}/cat1/quota.0
-man/${JAMANDIR}/cat1/ranlib.0
-man/${JAMANDIR}/cat1/rcmd.0
-man/${JAMANDIR}/cat1/rcp.0
-man/${JAMANDIR}/cat1/rcs.0
-man/${JAMANDIR}/cat1/rcsclean.0
-man/${JAMANDIR}/cat1/rcsdiff.0
-man/${JAMANDIR}/cat1/rcsfreeze.0
-man/${JAMANDIR}/cat1/rcsintro.0
-man/${JAMANDIR}/cat1/rcsmerge.0
-man/${JAMANDIR}/cat1/rdist.0
-man/${JAMANDIR}/cat1/refer.0
-man/${JAMANDIR}/cat1/rehash.0
-man/${JAMANDIR}/cat1/repeat.0
-man/${JAMANDIR}/cat1/reset.0
-man/${JAMANDIR}/cat1/rev.0
-man/${JAMANDIR}/cat1/rlog.0
-man/${JAMANDIR}/cat1/rlogin.0
-man/${JAMANDIR}/cat1/rm.0
-man/${JAMANDIR}/cat1/rmdir.0
-man/${JAMANDIR}/cat1/rpcgen.0
-man/${JAMANDIR}/cat1/rsh.0
-man/${JAMANDIR}/cat1/rtld.0
-man/${JAMANDIR}/cat1/rup.0
-man/${JAMANDIR}/cat1/ruptime.0
-man/${JAMANDIR}/cat1/rusers.0
-man/${JAMANDIR}/cat1/rwall.0
-man/${JAMANDIR}/cat1/rwho.0
-man/${JAMANDIR}/cat1/script.0
-man/${JAMANDIR}/cat1/sdiff.0
-man/${JAMANDIR}/cat1/sed.0
-man/${JAMANDIR}/cat1/send-pr.0
-man/${JAMANDIR}/cat1/sh.0
-man/${JAMANDIR}/cat1/shar.0
-man/${JAMANDIR}/cat1/size.0
-man/${JAMANDIR}/cat1/skey.0
-man/${JAMANDIR}/cat1/skeyaudit.0
-man/${JAMANDIR}/cat1/skeyinfo.0
-man/${JAMANDIR}/cat1/skeyinit.0
-man/${JAMANDIR}/cat1/sleep.0
-man/${JAMANDIR}/cat1/soelim.0
-man/${JAMANDIR}/cat1/sort.0
-man/${JAMANDIR}/cat1/source.0
-man/${JAMANDIR}/cat1/split.0
-man/${JAMANDIR}/cat1/stop.0
-man/${JAMANDIR}/cat1/strings.0
-man/${JAMANDIR}/cat1/strip.0
-man/${JAMANDIR}/cat1/stty.0
-man/${JAMANDIR}/cat1/su.0
-man/${JAMANDIR}/cat1/sum.0
-man/${JAMANDIR}/cat1/suspend.0
-man/${JAMANDIR}/cat1/tail.0
-man/${JAMANDIR}/cat1/talk.0
-man/${JAMANDIR}/cat1/tar.0
-man/${JAMANDIR}/cat1/tbl.0
-man/${JAMANDIR}/cat1/tcopy.0
-man/${JAMANDIR}/cat1/tee.0
-man/${JAMANDIR}/cat1/telnet.0
-man/${JAMANDIR}/cat1/test.0
-man/${JAMANDIR}/cat1/tfmtodit.0
-man/${JAMANDIR}/cat1/tftp.0
-man/${JAMANDIR}/cat1/time.0
-man/${JAMANDIR}/cat1/tip.0
-man/${JAMANDIR}/cat1/tn3270.0
-man/${JAMANDIR}/cat1/touch.0
-man/${JAMANDIR}/cat1/tput.0
-man/${JAMANDIR}/cat1/tr.0
-man/${JAMANDIR}/cat1/troff.0
-man/${JAMANDIR}/cat1/true.0
-man/${JAMANDIR}/cat1/tset.0
-man/${JAMANDIR}/cat1/tsort.0
-man/${JAMANDIR}/cat1/tty.0
-man/${JAMANDIR}/cat1/ul.0
-man/${JAMANDIR}/cat1/uname.0
-man/${JAMANDIR}/cat1/uncompress.0
-man/${JAMANDIR}/cat1/unexpand.0
-man/${JAMANDIR}/cat1/unifdef.0
-man/${JAMANDIR}/cat1/uniq.0
-man/${JAMANDIR}/cat1/units.0
-man/${JAMANDIR}/cat1/unvis.0
-man/${JAMANDIR}/cat1/uptime.0
-man/${JAMANDIR}/cat1/users.0
-man/${JAMANDIR}/cat1/uucp.0
-man/${JAMANDIR}/cat1/uudecode.0
-man/${JAMANDIR}/cat1/uuencode.0
-man/${JAMANDIR}/cat1/uustat.0
-man/${JAMANDIR}/cat1/uux.0
-man/${JAMANDIR}/cat1/vacation.0
-man/${JAMANDIR}/cat1/vfontedpr.0
-man/${JAMANDIR}/cat1/vgrind.0
-man/${JAMANDIR}/cat1/vi.0
-man/${JAMANDIR}/cat1/view.0
-man/${JAMANDIR}/cat1/vis.0
-man/${JAMANDIR}/cat1/w.0
-man/${JAMANDIR}/cat1/wait.0
-man/${JAMANDIR}/cat1/wall.0
-man/${JAMANDIR}/cat1/wc.0
-man/${JAMANDIR}/cat1/what.0
-man/${JAMANDIR}/cat1/whatis.0
-man/${JAMANDIR}/cat1/whereis.0
-man/${JAMANDIR}/cat1/which.0
-man/${JAMANDIR}/cat1/who.0
-man/${JAMANDIR}/cat1/whoami.0
-man/${JAMANDIR}/cat1/whois.0
-man/${JAMANDIR}/cat1/window.0
-man/${JAMANDIR}/cat1/write.0
-man/${JAMANDIR}/cat1/xargs.0
-man/${JAMANDIR}/cat1/xstr.0
-man/${JAMANDIR}/cat1/yacc.0
-man/${JAMANDIR}/cat1/yes.0
-man/${JAMANDIR}/cat1/ypcat.0
-man/${JAMANDIR}/cat1/ypmatch.0
-man/${JAMANDIR}/cat1/yppasswd.0
-man/${JAMANDIR}/cat1/ypwhich.0
-man/${JAMANDIR}/cat1/zcat.0
-man/${JAMANDIR}/cat1/zcmp.0
-man/${JAMANDIR}/cat1/zdiff.0
-man/${JAMANDIR}/cat1/zforce.0
-man/${JAMANDIR}/cat1/zgrep.0
-man/${JAMANDIR}/cat1/zmore.0
-man/${JAMANDIR}/cat1/znew.0
-man/${JAMANDIR}/cat5/ftpd.conf.0
-man/${JAMANDIR}/cat5/inetd.conf.0
-man/${JAMANDIR}/cat6/banner.0
-man/${JAMANDIR}/cat7/mdoc.samples.0
-man/${JAMANDIR}/cat7/symlink.0
-man/${JAMANDIR}/cat8/ac.0
-man/${JAMANDIR}/cat8/accton.0
-man/${JAMANDIR}/cat8/amd.0
-man/${JAMANDIR}/cat8/amq.0
-man/${JAMANDIR}/cat8/arp.0
-man/${JAMANDIR}/cat8/atactl.0
-man/${JAMANDIR}/cat8/atrun.0
-man/${JAMANDIR}/cat8/badsect.0
-man/${JAMANDIR}/cat8/bootparamd.0
-man/${JAMANDIR}/cat8/bootpd.0
-man/${JAMANDIR}/cat8/bootpef.0
-man/${JAMANDIR}/cat8/bootpgw.0
-man/${JAMANDIR}/cat8/bootptest.0
-man/${JAMANDIR}/cat8/ccdconfig.0
-man/${JAMANDIR}/cat8/chat.0
-man/${JAMANDIR}/cat8/chown.0
-man/${JAMANDIR}/cat8/chroot.0
-man/${JAMANDIR}/cat8/clri.0
-man/${JAMANDIR}/cat8/comsat.0
-man/${JAMANDIR}/cat8/config.0
-man/${JAMANDIR}/cat8/cron.0
-man/${JAMANDIR}/cat8/dev_mkdb.0
-man/${JAMANDIR}/cat8/dhclient.0
-man/${JAMANDIR}/cat8/dhcpd.0
-man/${JAMANDIR}/cat8/disklabel.0
-man/${JAMANDIR}/cat8/diskpart.0
-man/${JAMANDIR}/cat8/dm.0
-man/${JAMANDIR}/cat8/dmesg.0
-man/${JAMANDIR}/cat8/dump.0
-man/${JAMANDIR}/cat8/dumpfs.0
-man/${JAMANDIR}/cat8/dumplfs.0
-man/${JAMANDIR}/cat8/edquota.0
-man/${JAMANDIR}/cat8/fastboot.0
-man/${JAMANDIR}/cat8/fasthalt.0
-man/${JAMANDIR}/cat8/fingerd.0
-man/${JAMANDIR}/cat8/fixmount.0
-man/${JAMANDIR}/cat8/fsck.0
-man/${JAMANDIR}/cat8/fsck_ext2fs.0
-man/${JAMANDIR}/cat8/fsck_ffs.0
-man/${JAMANDIR}/cat8/fsck_msdos.0
-man/${JAMANDIR}/cat8/fsdb.0
-man/${JAMANDIR}/cat8/fsinfo.0
-man/${JAMANDIR}/cat8/fsirand.0
-man/${JAMANDIR}/cat8/ftpd.0
-man/${JAMANDIR}/cat8/getNAME.0
-man/${JAMANDIR}/cat8/getty.0
-man/${JAMANDIR}/cat8/halt.0
-man/${JAMANDIR}/cat8/hlfsd.0
-man/${JAMANDIR}/cat8/identd.0
-man/${JAMANDIR}/cat8/ifconfig.0
-man/${JAMANDIR}/cat8/inetd.0
-man/${JAMANDIR}/cat8/init.0
-man/${JAMANDIR}/cat8/install-sid.0
-man/${JAMANDIR}/cat8/iostat.0
-man/${JAMANDIR}/cat8/ipf.0
-man/${JAMANDIR}/cat8/kgmon.0
-man/${JAMANDIR}/cat8/kvm_mkdb.0
-man/${JAMANDIR}/cat8/lastlogin.0
-man/${JAMANDIR}/cat8/ldconfig.0
-man/${JAMANDIR}/cat8/lfs_cleanerd.0
-man/${JAMANDIR}/cat8/lockd.0
-man/${JAMANDIR}/cat8/lpc.0
-man/${JAMANDIR}/cat8/lpd.0
-man/${JAMANDIR}/cat8/mail.local.0
-man/${JAMANDIR}/cat8/mailstats.0
-man/${JAMANDIR}/cat8/makekey.0
-man/${JAMANDIR}/cat8/makemap.0
-man/${JAMANDIR}/cat8/makewhatis.0
-man/${JAMANDIR}/cat8/map-mbone.0
-man/${JAMANDIR}/cat8/mdconfig.0
-man/${JAMANDIR}/cat8/mdsetimage.0
-man/${JAMANDIR}/cat8/mfs.0
-man/${JAMANDIR}/cat8/mk-amd-map.0
-man/${JAMANDIR}/cat8/mknetid.0
-man/${JAMANDIR}/cat8/mknod.0
-man/${JAMANDIR}/cat8/modload.0
-man/${JAMANDIR}/cat8/modstat.0
-man/${JAMANDIR}/cat8/modunload.0
-man/${JAMANDIR}/cat8/mount.0
-man/${JAMANDIR}/cat8/mount_ados.0
-man/${JAMANDIR}/cat8/mount_cd9660.0
-man/${JAMANDIR}/cat8/mount_ext2fs.0
-man/${JAMANDIR}/cat8/mount_fdesc.0
-man/${JAMANDIR}/cat8/mount_ffs.0
-man/${JAMANDIR}/cat8/mount_filecore.0
-man/${JAMANDIR}/cat8/mount_kernfs.0
-man/${JAMANDIR}/cat8/mount_lfs.0
-man/${JAMANDIR}/cat8/mount_mfs.0
-man/${JAMANDIR}/cat8/mount_msdos.0
-man/${JAMANDIR}/cat8/mount_nfs.0
-man/${JAMANDIR}/cat8/mount_null.0
-man/${JAMANDIR}/cat8/mount_portal.0
-man/${JAMANDIR}/cat8/mount_procfs.0
-man/${JAMANDIR}/cat8/mount_ufs.0
-man/${JAMANDIR}/cat8/mount_umap.0
-man/${JAMANDIR}/cat8/mount_union.0
-man/${JAMANDIR}/cat8/mountd.0
-man/${JAMANDIR}/cat8/mrinfo.0
-man/${JAMANDIR}/cat8/mrouted.0
-man/${JAMANDIR}/cat8/mtree.0
-man/${JAMANDIR}/cat8/named-xfer.0
-man/${JAMANDIR}/cat8/named.0
-man/${JAMANDIR}/cat8/named.reload.0
-man/${JAMANDIR}/cat8/named.restart.0
-man/${JAMANDIR}/cat8/netgroup_mkdb.0
-man/${JAMANDIR}/cat8/newfs.0
-man/${JAMANDIR}/cat8/newfs_msdos.0
-man/${JAMANDIR}/cat8/newlfs.0
-man/${JAMANDIR}/cat8/newsyslog.0
-man/${JAMANDIR}/cat8/nfsd.0
-man/${JAMANDIR}/cat8/nfsiod.0
-man/${JAMANDIR}/cat8/nologin.0
-man/${JAMANDIR}/cat8/nslookup.0
-man/${JAMANDIR}/cat8/pac.0
-man/${JAMANDIR}/cat8/ping.0
-man/${JAMANDIR}/cat8/portmap.0
-man/${JAMANDIR}/cat8/pppd.0
-man/${JAMANDIR}/cat8/pppstats.0
-man/${JAMANDIR}/cat8/praliases.0
-man/${JAMANDIR}/cat8/pstat.0
-man/${JAMANDIR}/cat8/pwd_mkdb.0
-man/${JAMANDIR}/cat8/quot.0
-man/${JAMANDIR}/cat8/quotacheck.0
-man/${JAMANDIR}/cat8/quotaoff.0
-man/${JAMANDIR}/cat8/quotaon.0
-man/${JAMANDIR}/cat8/raidctl.0
-man/${JAMANDIR}/cat8/rarpd.0
-man/${JAMANDIR}/cat8/rbootd.0
-man/${JAMANDIR}/cat8/rc.0
-man/${JAMANDIR}/cat8/rdate.0
-man/${JAMANDIR}/cat8/rdisc.0
-man/${JAMANDIR}/cat8/rdump.0
-man/${JAMANDIR}/cat8/reboot.0
-man/${JAMANDIR}/cat8/renice.0
-man/${JAMANDIR}/cat8/repquota.0
-man/${JAMANDIR}/cat8/restore.0
-man/${JAMANDIR}/cat8/rexecd.0
-man/${JAMANDIR}/cat8/rlogind.0
-man/${JAMANDIR}/cat8/rmail.0
-man/${JAMANDIR}/cat8/rmt.0
-man/${JAMANDIR}/cat8/rndctl.0
-man/${JAMANDIR}/cat8/route.0
-man/${JAMANDIR}/cat8/routed.0
-man/${JAMANDIR}/cat8/rpc.bootparamd.0
-man/${JAMANDIR}/cat8/rpc.lockd.0
-man/${JAMANDIR}/cat8/rpc.rquotad.0
-man/${JAMANDIR}/cat8/rpc.rstatd.0
-man/${JAMANDIR}/cat8/rpc.rusersd.0
-man/${JAMANDIR}/cat8/rpc.rwalld.0
-man/${JAMANDIR}/cat8/rpc.sprayd.0
-man/${JAMANDIR}/cat8/rpc.statd.0
-man/${JAMANDIR}/cat8/rpc.yppasswdd.0
-man/${JAMANDIR}/cat8/rpcinfo.0
-man/${JAMANDIR}/cat8/rquotad.0
-man/${JAMANDIR}/cat8/rrestore.0
-man/${JAMANDIR}/cat8/rshd.0
-man/${JAMANDIR}/cat8/rstatd.0
-man/${JAMANDIR}/cat8/rtquery.0
-man/${JAMANDIR}/cat8/rusersd.0
-man/${JAMANDIR}/cat8/rwalld.0
-man/${JAMANDIR}/cat8/rwhod.0
-man/${JAMANDIR}/cat8/sa.0
-man/${JAMANDIR}/cat8/savecore.0
-man/${JAMANDIR}/cat8/scsictl.0
-man/${JAMANDIR}/cat8/sendmail.0
-man/${JAMANDIR}/cat8/showmount.0
-man/${JAMANDIR}/cat8/shutdown.0
-man/${JAMANDIR}/cat8/slattach.0
-man/${JAMANDIR}/cat8/slip.0
-man/${JAMANDIR}/cat8/sliplogin.0
-man/${JAMANDIR}/cat8/slstats.0
-man/${JAMANDIR}/cat8/spray.0
-man/${JAMANDIR}/cat8/sprayd.0
-man/${JAMANDIR}/cat8/statd.0
-man/${JAMANDIR}/cat8/stdethers.0
-man/${JAMANDIR}/cat8/stdhosts.0
-man/${JAMANDIR}/cat8/swapctl.0
-man/${JAMANDIR}/cat8/swapon.0
-man/${JAMANDIR}/cat8/sync.0
-man/${JAMANDIR}/cat8/sysctl.0
-man/${JAMANDIR}/cat8/syslogd.0
-man/${JAMANDIR}/cat8/talkd.0
-man/${JAMANDIR}/cat8/tcpdump.0
-man/${JAMANDIR}/cat8/telnetd.0
-man/${JAMANDIR}/cat8/tftpd.0
-man/${JAMANDIR}/cat8/timed.0
-man/${JAMANDIR}/cat8/timedc.0
-man/${JAMANDIR}/cat8/traceroute.0
-man/${JAMANDIR}/cat8/trpt.0
-man/${JAMANDIR}/cat8/trsp.0
-man/${JAMANDIR}/cat8/ttyflags.0
-man/${JAMANDIR}/cat8/tunefs.0
-man/${JAMANDIR}/cat8/umount.0
-man/${JAMANDIR}/cat8/update.0
-man/${JAMANDIR}/cat8/uucico.0
-man/${JAMANDIR}/cat8/uucpd.0
-man/${JAMANDIR}/cat8/uugetty.0
-man/${JAMANDIR}/cat8/uuxqt.0
-man/${JAMANDIR}/cat8/vipw.0
-man/${JAMANDIR}/cat8/vmstat.0
-man/${JAMANDIR}/cat8/vnconfig.0
-man/${JAMANDIR}/cat8/wsconsctl.0
-man/${JAMANDIR}/cat8/ypbind.0
-man/${JAMANDIR}/cat8/ypinit.0
-man/${JAMANDIR}/cat8/yppasswdd.0
-man/${JAMANDIR}/cat8/yppoll.0
-man/${JAMANDIR}/cat8/yppush.0
-man/${JAMANDIR}/cat8/ypset.0
-man/${JAMANDIR}/cat8/yptest.0
-man/${JAMANDIR}/cat9/ETHER_FIRST_MULTI.0
-man/${JAMANDIR}/cat9/ETHER_IS_MULTICAST.0
-man/${JAMANDIR}/cat9/ETHER_NEXT_MULTI.0
-man/${JAMANDIR}/cat9/MCHTYPE.0
-man/${JAMANDIR}/cat9/MCLGET.0
-man/${JAMANDIR}/cat9/MEXTADD.0
-man/${JAMANDIR}/cat9/MEXTMALLOC.0
-man/${JAMANDIR}/cat9/MEXTREMOVE.0
-man/${JAMANDIR}/cat9/MFREE.0
-man/${JAMANDIR}/cat9/MGET.0
-man/${JAMANDIR}/cat9/MGETHDR.0
-man/${JAMANDIR}/cat9/MH_ALIGN.0
-man/${JAMANDIR}/cat9/M_ALIGN.0
-man/${JAMANDIR}/cat9/M_COPY_PKTHDR.0
-man/${JAMANDIR}/cat9/M_LEADINGSPACE.0
-man/${JAMANDIR}/cat9/M_PREPEND.0
-man/${JAMANDIR}/cat9/M_TRAILINGSPACE.0
-man/${JAMANDIR}/cat9/access.0
-man/${JAMANDIR}/cat9/arp.0
-man/${JAMANDIR}/cat9/arp_ifinit.0
-man/${JAMANDIR}/cat9/arpintr.0
-man/${JAMANDIR}/cat9/arpresolve.0
-man/${JAMANDIR}/cat9/audio.0
-man/${JAMANDIR}/cat9/boottime.0
-man/${JAMANDIR}/cat9/bounds_check_with_label.0
-man/${JAMANDIR}/cat9/bus_dma.0
-man/${JAMANDIR}/cat9/bus_dmamap_create.0
-man/${JAMANDIR}/cat9/bus_dmamap_destroy.0
-man/${JAMANDIR}/cat9/bus_dmamap_load.0
-man/${JAMANDIR}/cat9/bus_dmamap_load_mbuf.0
-man/${JAMANDIR}/cat9/bus_dmamap_load_raw.0
-man/${JAMANDIR}/cat9/bus_dmamap_load_uio.0
-man/${JAMANDIR}/cat9/bus_dmamap_sync.0
-man/${JAMANDIR}/cat9/bus_dmamap_unload.0
-man/${JAMANDIR}/cat9/bus_dmamem_alloc.0
-man/${JAMANDIR}/cat9/bus_dmamem_free.0
-man/${JAMANDIR}/cat9/bus_dmamem_map.0
-man/${JAMANDIR}/cat9/bus_dmamem_mmap.0
-man/${JAMANDIR}/cat9/bus_dmamem_unmap.0
-man/${JAMANDIR}/cat9/bus_space.0
-man/${JAMANDIR}/cat9/bus_space_alloc.0
-man/${JAMANDIR}/cat9/bus_space_barrier.0
-man/${JAMANDIR}/cat9/bus_space_copy_region_1.0
-man/${JAMANDIR}/cat9/bus_space_copy_region_2.0
-man/${JAMANDIR}/cat9/bus_space_copy_region_4.0
-man/${JAMANDIR}/cat9/bus_space_copy_region_8.0
-man/${JAMANDIR}/cat9/bus_space_free.0
-man/${JAMANDIR}/cat9/bus_space_map.0
-man/${JAMANDIR}/cat9/bus_space_read_1.0
-man/${JAMANDIR}/cat9/bus_space_read_2.0
-man/${JAMANDIR}/cat9/bus_space_read_4.0
-man/${JAMANDIR}/cat9/bus_space_read_8.0
-man/${JAMANDIR}/cat9/bus_space_read_multi_1.0
-man/${JAMANDIR}/cat9/bus_space_read_multi_2.0
-man/${JAMANDIR}/cat9/bus_space_read_multi_4.0
-man/${JAMANDIR}/cat9/bus_space_read_multi_8.0
-man/${JAMANDIR}/cat9/bus_space_read_region_1.0
-man/${JAMANDIR}/cat9/bus_space_read_region_2.0
-man/${JAMANDIR}/cat9/bus_space_read_region_4.0
-man/${JAMANDIR}/cat9/bus_space_read_region_8.0
-man/${JAMANDIR}/cat9/bus_space_set_region_1.0
-man/${JAMANDIR}/cat9/bus_space_set_region_2.0
-man/${JAMANDIR}/cat9/bus_space_set_region_4.0
-man/${JAMANDIR}/cat9/bus_space_set_region_8.0
-man/${JAMANDIR}/cat9/bus_space_subregion.0
-man/${JAMANDIR}/cat9/bus_space_unmap.0
-man/${JAMANDIR}/cat9/bus_space_write_1.0
-man/${JAMANDIR}/cat9/bus_space_write_2.0
-man/${JAMANDIR}/cat9/bus_space_write_4.0
-man/${JAMANDIR}/cat9/bus_space_write_8.0
-man/${JAMANDIR}/cat9/bus_space_write_multi_1.0
-man/${JAMANDIR}/cat9/bus_space_write_multi_2.0
-man/${JAMANDIR}/cat9/bus_space_write_multi_4.0
-man/${JAMANDIR}/cat9/bus_space_write_multi_8.0
-man/${JAMANDIR}/cat9/bus_space_write_region_1.0
-man/${JAMANDIR}/cat9/bus_space_write_region_2.0
-man/${JAMANDIR}/cat9/bus_space_write_region_4.0
-man/${JAMANDIR}/cat9/bus_space_write_region_8.0
-man/${JAMANDIR}/cat9/cltom.0
-man/${JAMANDIR}/cat9/copy.0
-man/${JAMANDIR}/cat9/copyin.0
-man/${JAMANDIR}/cat9/copyinstr.0
-man/${JAMANDIR}/cat9/copyout.0
-man/${JAMANDIR}/cat9/copyoutstr.0
-man/${JAMANDIR}/cat9/copystr.0
-man/${JAMANDIR}/cat9/cpu_reboot.0
-man/${JAMANDIR}/cat9/cpu_switch.0
-man/${JAMANDIR}/cat9/ctxsw.0
-man/${JAMANDIR}/cat9/disk.0
-man/${JAMANDIR}/cat9/disk_attach.0
-man/${JAMANDIR}/cat9/disk_busy.0
-man/${JAMANDIR}/cat9/disk_detatch.0
-man/${JAMANDIR}/cat9/disk_find.0
-man/${JAMANDIR}/cat9/disk_init.0
-man/${JAMANDIR}/cat9/disk_resetstat.0
-man/${JAMANDIR}/cat9/disk_unbusy.0
-man/${JAMANDIR}/cat9/disklabel.0
-man/${JAMANDIR}/cat9/doshutdownhooks.0
-man/${JAMANDIR}/cat9/ether_addmulti.0
-man/${JAMANDIR}/cat9/ether_delmulti.0
-man/${JAMANDIR}/cat9/ether_ifattach.0
-man/${JAMANDIR}/cat9/ethersubr.0
-man/${JAMANDIR}/cat9/extent.0
-man/${JAMANDIR}/cat9/extent_alloc.0
-man/${JAMANDIR}/cat9/extent_alloc_region.0
-man/${JAMANDIR}/cat9/extent_alloc_subregion.0
-man/${JAMANDIR}/cat9/extent_create.0
-man/${JAMANDIR}/cat9/extent_destroy.0
-man/${JAMANDIR}/cat9/extent_free.0
-man/${JAMANDIR}/cat9/extent_print.0
-man/${JAMANDIR}/cat9/fddi_addmulti.0
-man/${JAMANDIR}/cat9/fddi_delmulti.0
-man/${JAMANDIR}/cat9/fddi_ifattach.0
-man/${JAMANDIR}/cat9/fetch.0
-man/${JAMANDIR}/cat9/fork1.0
-man/${JAMANDIR}/cat9/free.0
-man/${JAMANDIR}/cat9/fubyte.0
-man/${JAMANDIR}/cat9/fuibyte.0
-man/${JAMANDIR}/cat9/fuiword.0
-man/${JAMANDIR}/cat9/fuswintr.0
-man/${JAMANDIR}/cat9/fusword.0
-man/${JAMANDIR}/cat9/fuword.0
-man/${JAMANDIR}/cat9/gsignal.0
-man/${JAMANDIR}/cat9/inittodr.0
-man/${JAMANDIR}/cat9/intro.0
-man/${JAMANDIR}/cat9/kernacc.0
-man/${JAMANDIR}/cat9/log.0
-man/${JAMANDIR}/cat9/m_adj.0
-man/${JAMANDIR}/cat9/m_cat.0
-man/${JAMANDIR}/cat9/m_copyback.0
-man/${JAMANDIR}/cat9/m_copydata.0
-man/${JAMANDIR}/cat9/m_copym.0
-man/${JAMANDIR}/cat9/m_copypacket.0
-man/${JAMANDIR}/cat9/m_devget.0
-man/${JAMANDIR}/cat9/m_free.0
-man/${JAMANDIR}/cat9/m_freem.0
-man/${JAMANDIR}/cat9/m_get.0
-man/${JAMANDIR}/cat9/m_getclr.0
-man/${JAMANDIR}/cat9/m_gethdr.0
-man/${JAMANDIR}/cat9/m_prepend.0
-man/${JAMANDIR}/cat9/m_pullup.0
-man/${JAMANDIR}/cat9/m_split.0
-man/${JAMANDIR}/cat9/malloc.0
-man/${JAMANDIR}/cat9/mbuf.0
-man/${JAMANDIR}/cat9/mi_switch.0
-man/${JAMANDIR}/cat9/microtime.0
-man/${JAMANDIR}/cat9/mono_time.0
-man/${JAMANDIR}/cat9/mtocl.0
-man/${JAMANDIR}/cat9/mtod.0
-man/${JAMANDIR}/cat9/panic.0
-man/${JAMANDIR}/cat9/pfil.0
-man/${JAMANDIR}/cat9/pfil_add_hook.0
-man/${JAMANDIR}/cat9/pfil_hook_get.0
-man/${JAMANDIR}/cat9/pfil_remove_hook.0
-man/${JAMANDIR}/cat9/pgsignal.0
-man/${JAMANDIR}/cat9/physio.0
-man/${JAMANDIR}/cat9/pool.0
-man/${JAMANDIR}/cat9/psignal.0
-man/${JAMANDIR}/cat9/readdisklabel.0
-man/${JAMANDIR}/cat9/resettodr.0
-man/${JAMANDIR}/cat9/rnd.0
-man/${JAMANDIR}/cat9/rnd_add_data.0
-man/${JAMANDIR}/cat9/rnd_add_uint32.0
-man/${JAMANDIR}/cat9/rnd_attach_source.0
-man/${JAMANDIR}/cat9/rnd_detach_source.0
-man/${JAMANDIR}/cat9/rt_timer.0
-man/${JAMANDIR}/cat9/rt_timer_add.0
-man/${JAMANDIR}/cat9/rt_timer_queue_change.0
-man/${JAMANDIR}/cat9/rt_timer_queue_create.0
-man/${JAMANDIR}/cat9/rt_timer_queue_destroy.0
-man/${JAMANDIR}/cat9/rt_timer_remove_all.0
-man/${JAMANDIR}/cat9/runtime.0
-man/${JAMANDIR}/cat9/setdisklabel.0
-man/${JAMANDIR}/cat9/shutdownhook_disestablish.0
-man/${JAMANDIR}/cat9/shutdownhook_establish.0
-man/${JAMANDIR}/cat9/sleep.0
-man/${JAMANDIR}/cat9/spl.0
-man/${JAMANDIR}/cat9/spl0.0
-man/${JAMANDIR}/cat9/splbio.0
-man/${JAMANDIR}/cat9/splclock.0
-man/${JAMANDIR}/cat9/splhigh.0
-man/${JAMANDIR}/cat9/splimp.0
-man/${JAMANDIR}/cat9/splnet.0
-man/${JAMANDIR}/cat9/splsched.0
-man/${JAMANDIR}/cat9/splserial.0
-man/${JAMANDIR}/cat9/splsoftclock.0
-man/${JAMANDIR}/cat9/splsoftnet.0
-man/${JAMANDIR}/cat9/splsoftserial.0
-man/${JAMANDIR}/cat9/splstatclock.0
-man/${JAMANDIR}/cat9/spltty.0
-man/${JAMANDIR}/cat9/splx.0
-man/${JAMANDIR}/cat9/store.0
-man/${JAMANDIR}/cat9/subyte.0
-man/${JAMANDIR}/cat9/suibyte.0
-man/${JAMANDIR}/cat9/suiword.0
-man/${JAMANDIR}/cat9/suswintr.0
-man/${JAMANDIR}/cat9/susword.0
-man/${JAMANDIR}/cat9/suword.0
-man/${JAMANDIR}/cat9/time.0
-man/${JAMANDIR}/cat9/timeout.0
-man/${JAMANDIR}/cat9/tsleep.0
-man/${JAMANDIR}/cat9/uao_create.0
-man/${JAMANDIR}/cat9/uao_detach.0
-man/${JAMANDIR}/cat9/uao_reference.0
-man/${JAMANDIR}/cat9/untimeout.0
-man/${JAMANDIR}/cat9/useracc.0
-man/${JAMANDIR}/cat9/uvm.0
-man/${JAMANDIR}/cat9/uvm_chgkprot.0
-man/${JAMANDIR}/cat9/uvm_coredump.0
-man/${JAMANDIR}/cat9/uvm_deallocate.0
-man/${JAMANDIR}/cat9/uvm_fault.0
-man/${JAMANDIR}/cat9/uvm_fork.0
-man/${JAMANDIR}/cat9/uvm_grow.0
-man/${JAMANDIR}/cat9/uvm_init.0
-man/${JAMANDIR}/cat9/uvm_init_limits.0
-man/${JAMANDIR}/cat9/uvm_io.0
-man/${JAMANDIR}/cat9/uvm_kernacc.0
-man/${JAMANDIR}/cat9/uvm_km_alloc.0
-man/${JAMANDIR}/cat9/uvm_km_alloc1.0
-man/${JAMANDIR}/cat9/uvm_km_free.0
-man/${JAMANDIR}/cat9/uvm_km_free_wakeup.0
-man/${JAMANDIR}/cat9/uvm_km_kmemalloc.0
-man/${JAMANDIR}/cat9/uvm_km_suballoc.0
-man/${JAMANDIR}/cat9/uvm_km_valloc.0
-man/${JAMANDIR}/cat9/uvm_km_valloc_wait.0
-man/${JAMANDIR}/cat9/uvm_km_zalloc.0
-man/${JAMANDIR}/cat9/uvm_map.0
-man/${JAMANDIR}/cat9/uvm_map_checkprot.0
-man/${JAMANDIR}/cat9/uvm_map_pageable.0
-man/${JAMANDIR}/cat9/uvm_map_protect.0
-man/${JAMANDIR}/cat9/uvm_meter.0
-man/${JAMANDIR}/cat9/uvm_page_physload.0
-man/${JAMANDIR}/cat9/uvm_pagealloc.0
-man/${JAMANDIR}/cat9/uvm_pagefree.0
-man/${JAMANDIR}/cat9/uvm_pageout.0
-man/${JAMANDIR}/cat9/uvm_pagerealloc.0
-man/${JAMANDIR}/cat9/uvm_pglistalloc.0
-man/${JAMANDIR}/cat9/uvm_pglistfree.0
-man/${JAMANDIR}/cat9/uvm_scheduler.0
-man/${JAMANDIR}/cat9/uvm_setpagesize.0
-man/${JAMANDIR}/cat9/uvm_swap_init.0
-man/${JAMANDIR}/cat9/uvm_swapin.0
-man/${JAMANDIR}/cat9/uvm_sysctl.0
-man/${JAMANDIR}/cat9/uvm_useracc.0
-man/${JAMANDIR}/cat9/uvm_vnp_setsize.0
-man/${JAMANDIR}/cat9/uvm_vnp_sync.0
-man/${JAMANDIR}/cat9/uvm_vnp_terminate.0
-man/${JAMANDIR}/cat9/uvm_vslock.0
-man/${JAMANDIR}/cat9/uvm_vsunlock.0
-man/${JAMANDIR}/cat9/uvmspace_alloc.0
-man/${JAMANDIR}/cat9/uvmspace_exec.0
-man/${JAMANDIR}/cat9/uvmspace_fork.0
-man/${JAMANDIR}/cat9/uvmspace_free.0
-man/${JAMANDIR}/cat9/uvmspace_share.0
-man/${JAMANDIR}/cat9/uvmspace_unshare.0
-man/${JAMANDIR}/cat9/uvn_attach.0
-man/${JAMANDIR}/cat9/vslock.0
-man/${JAMANDIR}/cat9/vsunlock.0
-man/${JAMANDIR}/cat9/wakeup.0
-man/${JAMANDIR}/cat9/writedisklabel.0
-man/${JAMANDIR}/man1/Mail.1
-man/${JAMANDIR}/man1/[.1
-man/${JAMANDIR}/man1/addftinfo.1
-man/${JAMANDIR}/man1/alias.1
-man/${JAMANDIR}/man1/apply.1
-man/${JAMANDIR}/man1/apropos.1
-man/${JAMANDIR}/man1/ar.1
-man/${JAMANDIR}/man1/as.1
-man/${JAMANDIR}/man1/asa.1
-man/${JAMANDIR}/man1/at.1
-man/${JAMANDIR}/man1/atq.1
-man/${JAMANDIR}/man1/atrm.1
-man/${JAMANDIR}/man1/audioctl.1
-man/${JAMANDIR}/man1/awk.1
-man/${JAMANDIR}/man1/banner.1
-man/${JAMANDIR}/man1/basename.1
-man/${JAMANDIR}/man1/batch.1
-man/${JAMANDIR}/man1/bc.1
-man/${JAMANDIR}/man1/bg.1
-man/${JAMANDIR}/man1/biff.1
-man/${JAMANDIR}/man1/bunzip2.1
-man/${JAMANDIR}/man1/bzcat.1
-man/${JAMANDIR}/man1/bzip2.1
-man/${JAMANDIR}/man1/bzip2recover.1
-man/${JAMANDIR}/man1/c++.1
-man/${JAMANDIR}/man1/cal.1
-man/${JAMANDIR}/man1/calendar.1
-man/${JAMANDIR}/man1/cap_mkdb.1
-man/${JAMANDIR}/man1/cat.1
-man/${JAMANDIR}/man1/cc.1
-man/${JAMANDIR}/man1/cc1.1
-man/${JAMANDIR}/man1/cc1obj.1
-man/${JAMANDIR}/man1/cc1plus.1
-man/${JAMANDIR}/man1/cccp.1
-man/${JAMANDIR}/man1/cd.1
-man/${JAMANDIR}/man1/checknr.1
-man/${JAMANDIR}/man1/chflags.1
-man/${JAMANDIR}/man1/chfn.1
-man/${JAMANDIR}/man1/chgrp.1
-man/${JAMANDIR}/man1/chio.1
-man/${JAMANDIR}/man1/chmod.1
-man/${JAMANDIR}/man1/chpass.1
-man/${JAMANDIR}/man1/chsh.1
-man/${JAMANDIR}/man1/ci.1
-man/${JAMANDIR}/man1/cksum.1
-man/${JAMANDIR}/man1/clear.1
-man/${JAMANDIR}/man1/cmp.1
-man/${JAMANDIR}/man1/co.1
-man/${JAMANDIR}/man1/col.1
-man/${JAMANDIR}/man1/colcrt.1
-man/${JAMANDIR}/man1/colrm.1
-man/${JAMANDIR}/man1/column.1
-man/${JAMANDIR}/man1/comm.1
-man/${JAMANDIR}/man1/compress.1
-man/${JAMANDIR}/man1/cp.1
-man/${JAMANDIR}/man1/cpio.1
-man/${JAMANDIR}/man1/cpp.1
-man/${JAMANDIR}/man1/crontab.1
-man/${JAMANDIR}/man1/csh.1
-man/${JAMANDIR}/man1/ctags.1
-man/${JAMANDIR}/man1/cu.1
-man/${JAMANDIR}/man1/cut.1
-man/${JAMANDIR}/man1/date.1
-man/${JAMANDIR}/man1/dd.1
-man/${JAMANDIR}/man1/df.1
-man/${JAMANDIR}/man1/diff.1
-man/${JAMANDIR}/man1/diff3.1
-man/${JAMANDIR}/man1/dirname.1
-man/${JAMANDIR}/man1/dirs.1
-man/${JAMANDIR}/man1/dnsquery.1
-man/${JAMANDIR}/man1/domainname.1
-man/${JAMANDIR}/man1/du.1
-man/${JAMANDIR}/man1/echo.1
-man/${JAMANDIR}/man1/ed.1
-man/${JAMANDIR}/man1/egrep.1
-man/${JAMANDIR}/man1/eject.1
-man/${JAMANDIR}/man1/env.1
-man/${JAMANDIR}/man1/eqn.1
-man/${JAMANDIR}/man1/error.1
-man/${JAMANDIR}/man1/ex.1
-man/${JAMANDIR}/man1/expand.1
-man/${JAMANDIR}/man1/expr.1
-man/${JAMANDIR}/man1/false.1
-man/${JAMANDIR}/man1/fdformat.1
-man/${JAMANDIR}/man1/fg.1
-man/${JAMANDIR}/man1/fgrep.1
-man/${JAMANDIR}/man1/file.1
-man/${JAMANDIR}/man1/find.1
-man/${JAMANDIR}/man1/finger.1
-man/${JAMANDIR}/man1/flex.1
-man/${JAMANDIR}/man1/fmt.1
-man/${JAMANDIR}/man1/fold.1
-man/${JAMANDIR}/man1/foreach.1
-man/${JAMANDIR}/man1/fpr.1
-man/${JAMANDIR}/man1/from.1
-man/${JAMANDIR}/man1/fsplit.1
-man/${JAMANDIR}/man1/fstat.1
-man/${JAMANDIR}/man1/ftp.1
-man/${JAMANDIR}/man1/g++.1
-man/${JAMANDIR}/man1/gcc.1
-man/${JAMANDIR}/man1/gcpp.1
-man/${JAMANDIR}/man1/gdb.1
-man/${JAMANDIR}/man1/gencat.1
-man/${JAMANDIR}/man1/genclass.1
-man/${JAMANDIR}/man1/getconf.1
-man/${JAMANDIR}/man1/getopt.1
-man/${JAMANDIR}/man1/gprof.1
-man/${JAMANDIR}/man1/grep.1
-man/${JAMANDIR}/man1/grodvi.1
-man/${JAMANDIR}/man1/groff.1
-man/${JAMANDIR}/man1/grog.1
-man/${JAMANDIR}/man1/grops.1
-man/${JAMANDIR}/man1/grotty.1
-man/${JAMANDIR}/man1/groups.1
-man/${JAMANDIR}/man1/gunzip.1
-man/${JAMANDIR}/man1/gzcat.1
-man/${JAMANDIR}/man1/gzexe.1
-man/${JAMANDIR}/man1/gzip.1
-man/${JAMANDIR}/man1/head.1
-man/${JAMANDIR}/man1/hexdump.1
-man/${JAMANDIR}/man1/history.1
-man/${JAMANDIR}/man1/hostname.1
-man/${JAMANDIR}/man1/id.1
-man/${JAMANDIR}/man1/ident.1
-man/${JAMANDIR}/man1/indent.1
-man/${JAMANDIR}/man1/indxbib.1
-man/${JAMANDIR}/man1/install.1
-man/${JAMANDIR}/man1/intro.1
-man/${JAMANDIR}/man1/ipcrm.1
-man/${JAMANDIR}/man1/ipcs.1
-man/${JAMANDIR}/man1/jobs.1
-man/${JAMANDIR}/man1/join.1
-man/${JAMANDIR}/man1/kdump.1
-man/${JAMANDIR}/man1/kill.1
-man/${JAMANDIR}/man1/ktrace.1
-man/${JAMANDIR}/man1/lam.1
-man/${JAMANDIR}/man1/last.1
-man/${JAMANDIR}/man1/lastcomm.1
-man/${JAMANDIR}/man1/ld.1
-man/${JAMANDIR}/man1/ld.so.1
-man/${JAMANDIR}/man1/ldd.1
-man/${JAMANDIR}/man1/leave.1
-man/${JAMANDIR}/man1/less.1
-man/${JAMANDIR}/man1/lex.1
-man/${JAMANDIR}/man1/limit.1
-man/${JAMANDIR}/man1/lkbib.1
-man/${JAMANDIR}/man1/ln.1
-man/${JAMANDIR}/man1/locate.1
-man/${JAMANDIR}/man1/lock.1
-man/${JAMANDIR}/man1/logger.1
-man/${JAMANDIR}/man1/login.1
-man/${JAMANDIR}/man1/logname.1
-man/${JAMANDIR}/man1/look.1
-man/${JAMANDIR}/man1/lookbib.1
-man/${JAMANDIR}/man1/lorder.1
-man/${JAMANDIR}/man1/lpq.1
-man/${JAMANDIR}/man1/lpr.1
-man/${JAMANDIR}/man1/lprm.1
-man/${JAMANDIR}/man1/lptest.1
-man/${JAMANDIR}/man1/ls.1
-man/${JAMANDIR}/man1/m4.1
-man/${JAMANDIR}/man1/machine.1
-man/${JAMANDIR}/man1/mail.1
-man/${JAMANDIR}/man1/mailq.1
-man/${JAMANDIR}/man1/mailx.1
-man/${JAMANDIR}/man1/make.1
-man/${JAMANDIR}/man1/man.1
-man/${JAMANDIR}/man1/md5.1
-man/${JAMANDIR}/man1/merge.1
-man/${JAMANDIR}/man1/mesg.1
-man/${JAMANDIR}/man1/mixerctl.1
-man/${JAMANDIR}/man1/mkdep.1
-man/${JAMANDIR}/man1/mkdir.1
-man/${JAMANDIR}/man1/mkfifo.1
-man/${JAMANDIR}/man1/mkstr.1
-man/${JAMANDIR}/man1/more.1
-man/${JAMANDIR}/man1/mset.1
-man/${JAMANDIR}/man1/msgs.1
-man/${JAMANDIR}/man1/mt.1
-man/${JAMANDIR}/man1/mv.1
-man/${JAMANDIR}/man1/neqn.1
-man/${JAMANDIR}/man1/netstat.1
-man/${JAMANDIR}/man1/newaliases.1
-man/${JAMANDIR}/man1/nfsstat.1
-man/${JAMANDIR}/man1/nice.1
-man/${JAMANDIR}/man1/nm.1
-man/${JAMANDIR}/man1/nohup.1
-man/${JAMANDIR}/man1/nroff.1
-man/${JAMANDIR}/man1/od.1
-man/${JAMANDIR}/man1/page.1
-man/${JAMANDIR}/man1/pagesize.1
-man/${JAMANDIR}/man1/passwd.1
-man/${JAMANDIR}/man1/paste.1
-man/${JAMANDIR}/man1/patch.1
-man/${JAMANDIR}/man1/pax.1
-man/${JAMANDIR}/man1/pfbtops.1
-man/${JAMANDIR}/man1/pic.1
-man/${JAMANDIR}/man1/popd.1
-man/${JAMANDIR}/man1/pr.1
-man/${JAMANDIR}/man1/printenv.1
-man/${JAMANDIR}/man1/printf.1
-man/${JAMANDIR}/man1/ps.1
-man/${JAMANDIR}/man1/psbb.1
-man/${JAMANDIR}/man1/psroff.1
-man/${JAMANDIR}/man1/pushd.1
-man/${JAMANDIR}/man1/pwd.1
-man/${JAMANDIR}/man1/quota.1
-man/${JAMANDIR}/man1/ranlib.1
-man/${JAMANDIR}/man1/rcmd.1
-man/${JAMANDIR}/man1/rcp.1
-man/${JAMANDIR}/man1/rcs.1
-man/${JAMANDIR}/man1/rcsclean.1
-man/${JAMANDIR}/man1/rcsdiff.1
-man/${JAMANDIR}/man1/rcsfreeze.1
-man/${JAMANDIR}/man1/rcsintro.1
-man/${JAMANDIR}/man1/rcsmerge.1
-man/${JAMANDIR}/man1/rdist.1
-man/${JAMANDIR}/man1/refer.1
-man/${JAMANDIR}/man1/rehash.1
-man/${JAMANDIR}/man1/repeat.1
-man/${JAMANDIR}/man1/reset.1
-man/${JAMANDIR}/man1/rev.1
-man/${JAMANDIR}/man1/rlog.1
-man/${JAMANDIR}/man1/rlogin.1
-man/${JAMANDIR}/man1/rm.1
-man/${JAMANDIR}/man1/rmdir.1
-man/${JAMANDIR}/man1/rpcgen.1
-man/${JAMANDIR}/man1/rsh.1
-man/${JAMANDIR}/man1/rtld.1
-man/${JAMANDIR}/man1/rup.1
-man/${JAMANDIR}/man1/ruptime.1
-man/${JAMANDIR}/man1/rusers.1
-man/${JAMANDIR}/man1/rwall.1
-man/${JAMANDIR}/man1/rwho.1
-man/${JAMANDIR}/man1/script.1
-man/${JAMANDIR}/man1/sdiff.1
-man/${JAMANDIR}/man1/sed.1
-man/${JAMANDIR}/man1/send-pr.1
-man/${JAMANDIR}/man1/sh.1
-man/${JAMANDIR}/man1/shar.1
-man/${JAMANDIR}/man1/size.1
-man/${JAMANDIR}/man1/skey.1
-man/${JAMANDIR}/man1/skeyaudit.1
-man/${JAMANDIR}/man1/skeyinfo.1
-man/${JAMANDIR}/man1/skeyinit.1
-man/${JAMANDIR}/man1/sleep.1
-man/${JAMANDIR}/man1/soelim.1
-man/${JAMANDIR}/man1/sort.1
-man/${JAMANDIR}/man1/source.1
-man/${JAMANDIR}/man1/split.1
-man/${JAMANDIR}/man1/stop.1
-man/${JAMANDIR}/man1/strings.1
-man/${JAMANDIR}/man1/strip.1
-man/${JAMANDIR}/man1/stty.1
-man/${JAMANDIR}/man1/su.1
-man/${JAMANDIR}/man1/sum.1
-man/${JAMANDIR}/man1/suspend.1
-man/${JAMANDIR}/man1/tail.1
-man/${JAMANDIR}/man1/talk.1
-man/${JAMANDIR}/man1/tar.1
-man/${JAMANDIR}/man1/tbl.1
-man/${JAMANDIR}/man1/tcopy.1
-man/${JAMANDIR}/man1/tee.1
-man/${JAMANDIR}/man1/telnet.1
-man/${JAMANDIR}/man1/test.1
-man/${JAMANDIR}/man1/tfmtodit.1
-man/${JAMANDIR}/man1/tftp.1
-man/${JAMANDIR}/man1/time.1
-man/${JAMANDIR}/man1/tip.1
-man/${JAMANDIR}/man1/tn3270.1
-man/${JAMANDIR}/man1/touch.1
-man/${JAMANDIR}/man1/tput.1
-man/${JAMANDIR}/man1/tr.1
-man/${JAMANDIR}/man1/troff.1
-man/${JAMANDIR}/man1/true.1
-man/${JAMANDIR}/man1/tset.1
-man/${JAMANDIR}/man1/tsort.1
-man/${JAMANDIR}/man1/tty.1
-man/${JAMANDIR}/man1/ul.1
-man/${JAMANDIR}/man1/uname.1
-man/${JAMANDIR}/man1/uncompress.1
-man/${JAMANDIR}/man1/unexpand.1
-man/${JAMANDIR}/man1/unifdef.1
-man/${JAMANDIR}/man1/uniq.1
-man/${JAMANDIR}/man1/units.1
-man/${JAMANDIR}/man1/unvis.1
-man/${JAMANDIR}/man1/uptime.1
-man/${JAMANDIR}/man1/users.1
-man/${JAMANDIR}/man1/uucp.1
-man/${JAMANDIR}/man1/uudecode.1
-man/${JAMANDIR}/man1/uuencode.1
-man/${JAMANDIR}/man1/uustat.1
-man/${JAMANDIR}/man1/uux.1
-man/${JAMANDIR}/man1/vacation.1
-man/${JAMANDIR}/man1/vfontedpr.1
-man/${JAMANDIR}/man1/vgrind.1
-man/${JAMANDIR}/man1/vi.1
-man/${JAMANDIR}/man1/view.1
-man/${JAMANDIR}/man1/vis.1
-man/${JAMANDIR}/man1/w.1
-man/${JAMANDIR}/man1/wait.1
-man/${JAMANDIR}/man1/wall.1
-man/${JAMANDIR}/man1/wc.1
-man/${JAMANDIR}/man1/what.1
-man/${JAMANDIR}/man1/whatis.1
-man/${JAMANDIR}/man1/whereis.1
-man/${JAMANDIR}/man1/which.1
-man/${JAMANDIR}/man1/who.1
-man/${JAMANDIR}/man1/whoami.1
-man/${JAMANDIR}/man1/whois.1
-man/${JAMANDIR}/man1/window.1
-man/${JAMANDIR}/man1/write.1
-man/${JAMANDIR}/man1/xargs.1
-man/${JAMANDIR}/man1/xstr.1
-man/${JAMANDIR}/man1/yacc.1
-man/${JAMANDIR}/man1/yes.1
-man/${JAMANDIR}/man1/ypcat.1
-man/${JAMANDIR}/man1/ypmatch.1
-man/${JAMANDIR}/man1/yppasswd.1
-man/${JAMANDIR}/man1/ypwhich.1
-man/${JAMANDIR}/man1/zcat.1
-man/${JAMANDIR}/man1/zcmp.1
-man/${JAMANDIR}/man1/zdiff.1
-man/${JAMANDIR}/man1/zforce.1
-man/${JAMANDIR}/man1/zgrep.1
-man/${JAMANDIR}/man1/zmore.1
-man/${JAMANDIR}/man1/znew.1
-man/${JAMANDIR}/man5/ftpd.conf.5
-man/${JAMANDIR}/man5/inetd.conf.5
-man/${JAMANDIR}/man6/banner.6
-man/${JAMANDIR}/man7/mdoc.samples.7
-man/${JAMANDIR}/man7/symlink.7
-man/${JAMANDIR}/man8/ac.8
-man/${JAMANDIR}/man8/accton.8
-man/${JAMANDIR}/man8/amd.8
-man/${JAMANDIR}/man8/amq.8
-man/${JAMANDIR}/man8/arp.8
-man/${JAMANDIR}/man8/atactl.8
-man/${JAMANDIR}/man8/atrun.8
-man/${JAMANDIR}/man8/badsect.8
-man/${JAMANDIR}/man8/bootparamd.8
-man/${JAMANDIR}/man8/bootpd.8
-man/${JAMANDIR}/man8/bootpef.8
-man/${JAMANDIR}/man8/bootpgw.8
-man/${JAMANDIR}/man8/bootptest.8
-man/${JAMANDIR}/man8/ccdconfig.8
-man/${JAMANDIR}/man8/chat.8
-man/${JAMANDIR}/man8/chown.8
-man/${JAMANDIR}/man8/chroot.8
-man/${JAMANDIR}/man8/clri.8
-man/${JAMANDIR}/man8/comsat.8
-man/${JAMANDIR}/man8/config.8
-man/${JAMANDIR}/man8/cron.8
-man/${JAMANDIR}/man8/dev_mkdb.8
-man/${JAMANDIR}/man8/dhclient.8
-man/${JAMANDIR}/man8/dhcpd.8
-man/${JAMANDIR}/man8/disklabel.8
-man/${JAMANDIR}/man8/diskpart.8
-man/${JAMANDIR}/man8/dm.8
-man/${JAMANDIR}/man8/dmesg.8
-man/${JAMANDIR}/man8/dump.8
-man/${JAMANDIR}/man8/dumpfs.8
-man/${JAMANDIR}/man8/dumplfs.8
-man/${JAMANDIR}/man8/edquota.8
-man/${JAMANDIR}/man8/fastboot.8
-man/${JAMANDIR}/man8/fasthalt.8
-man/${JAMANDIR}/man8/fingerd.8
-man/${JAMANDIR}/man8/fixmount.8
-man/${JAMANDIR}/man8/fsck.8
-man/${JAMANDIR}/man8/fsck_ext2fs.8
-man/${JAMANDIR}/man8/fsck_ffs.8
-man/${JAMANDIR}/man8/fsck_msdos.8
-man/${JAMANDIR}/man8/fsdb.8
-man/${JAMANDIR}/man8/fsinfo.8
-man/${JAMANDIR}/man8/fsirand.8
-man/${JAMANDIR}/man8/ftpd.8
-man/${JAMANDIR}/man8/getNAME.8
-man/${JAMANDIR}/man8/getty.8
-man/${JAMANDIR}/man8/halt.8
-man/${JAMANDIR}/man8/hlfsd.8
-man/${JAMANDIR}/man8/identd.8
-man/${JAMANDIR}/man8/ifconfig.8
-man/${JAMANDIR}/man8/inetd.8
-man/${JAMANDIR}/man8/init.8
-man/${JAMANDIR}/man8/install-sid.8
-man/${JAMANDIR}/man8/iostat.8
-man/${JAMANDIR}/man8/ipf.8
-man/${JAMANDIR}/man8/kgmon.8
-man/${JAMANDIR}/man8/kvm_mkdb.8
-man/${JAMANDIR}/man8/lastlogin.8
-man/${JAMANDIR}/man8/ldconfig.8
-man/${JAMANDIR}/man8/lfs_cleanerd.8
-man/${JAMANDIR}/man8/lockd.8
-man/${JAMANDIR}/man8/lpc.8
-man/${JAMANDIR}/man8/lpd.8
-man/${JAMANDIR}/man8/mail.local.8
-man/${JAMANDIR}/man8/mailstats.8
-man/${JAMANDIR}/man8/makekey.8
-man/${JAMANDIR}/man8/makemap.8
-man/${JAMANDIR}/man8/makewhatis.8
-man/${JAMANDIR}/man8/map-mbone.8
-man/${JAMANDIR}/man8/mdconfig.8
-man/${JAMANDIR}/man8/mdsetimage.8
-man/${JAMANDIR}/man8/mfs.8
-man/${JAMANDIR}/man8/mk-amd-map.8
-man/${JAMANDIR}/man8/mknetid.8
-man/${JAMANDIR}/man8/mknod.8
-man/${JAMANDIR}/man8/modload.8
-man/${JAMANDIR}/man8/modstat.8
-man/${JAMANDIR}/man8/modunload.8
-man/${JAMANDIR}/man8/mount.8
-man/${JAMANDIR}/man8/mount_ados.8
-man/${JAMANDIR}/man8/mount_cd9660.8
-man/${JAMANDIR}/man8/mount_ext2fs.8
-man/${JAMANDIR}/man8/mount_fdesc.8
-man/${JAMANDIR}/man8/mount_ffs.8
-man/${JAMANDIR}/man8/mount_filecore.8
-man/${JAMANDIR}/man8/mount_kernfs.8
-man/${JAMANDIR}/man8/mount_lfs.8
-man/${JAMANDIR}/man8/mount_mfs.8
-man/${JAMANDIR}/man8/mount_msdos.8
-man/${JAMANDIR}/man8/mount_nfs.8
-man/${JAMANDIR}/man8/mount_null.8
-man/${JAMANDIR}/man8/mount_portal.8
-man/${JAMANDIR}/man8/mount_procfs.8
-man/${JAMANDIR}/man8/mount_ufs.8
-man/${JAMANDIR}/man8/mount_umap.8
-man/${JAMANDIR}/man8/mount_union.8
-man/${JAMANDIR}/man8/mountd.8
-man/${JAMANDIR}/man8/mrinfo.8
-man/${JAMANDIR}/man8/mrouted.8
-man/${JAMANDIR}/man8/mtree.8
-man/${JAMANDIR}/man8/named-xfer.8
-man/${JAMANDIR}/man8/named.8
-man/${JAMANDIR}/man8/named.reload.8
-man/${JAMANDIR}/man8/named.restart.8
-man/${JAMANDIR}/man8/netgroup_mkdb.8
-man/${JAMANDIR}/man8/newfs.8
-man/${JAMANDIR}/man8/newfs_msdos.8
-man/${JAMANDIR}/man8/newlfs.8
-man/${JAMANDIR}/man8/newsyslog.8
-man/${JAMANDIR}/man8/nfsd.8
-man/${JAMANDIR}/man8/nfsiod.8
-man/${JAMANDIR}/man8/nologin.8
-man/${JAMANDIR}/man8/nslookup.8
-man/${JAMANDIR}/man8/pac.8
-man/${JAMANDIR}/man8/ping.8
-man/${JAMANDIR}/man8/portmap.8
-man/${JAMANDIR}/man8/pppd.8
-man/${JAMANDIR}/man8/pppstats.8
-man/${JAMANDIR}/man8/praliases.8
-man/${JAMANDIR}/man8/pstat.8
-man/${JAMANDIR}/man8/pwd_mkdb.8
-man/${JAMANDIR}/man8/quot.8
-man/${JAMANDIR}/man8/quotacheck.8
-man/${JAMANDIR}/man8/quotaoff.8
-man/${JAMANDIR}/man8/quotaon.8
-man/${JAMANDIR}/man8/raidctl.8
-man/${JAMANDIR}/man8/rarpd.8
-man/${JAMANDIR}/man8/rbootd.8
-man/${JAMANDIR}/man8/rc.8
-man/${JAMANDIR}/man8/rdate.8
-man/${JAMANDIR}/man8/rdisc.8
-man/${JAMANDIR}/man8/rdump.8
-man/${JAMANDIR}/man8/reboot.8
-man/${JAMANDIR}/man8/renice.8
-man/${JAMANDIR}/man8/repquota.8
-man/${JAMANDIR}/man8/restore.8
-man/${JAMANDIR}/man8/rexecd.8
-man/${JAMANDIR}/man8/rlogind.8
-man/${JAMANDIR}/man8/rmail.8
-man/${JAMANDIR}/man8/rmt.8
-man/${JAMANDIR}/man8/rndctl.8
-man/${JAMANDIR}/man8/route.8
-man/${JAMANDIR}/man8/routed.8
-man/${JAMANDIR}/man8/rpc.bootparamd.8
-man/${JAMANDIR}/man8/rpc.lockd.8
-man/${JAMANDIR}/man8/rpc.rquotad.8
-man/${JAMANDIR}/man8/rpc.rstatd.8
-man/${JAMANDIR}/man8/rpc.rusersd.8
-man/${JAMANDIR}/man8/rpc.rwalld.8
-man/${JAMANDIR}/man8/rpc.sprayd.8
-man/${JAMANDIR}/man8/rpc.statd.8
-man/${JAMANDIR}/man8/rpc.yppasswdd.8
-man/${JAMANDIR}/man8/rpcinfo.8
-man/${JAMANDIR}/man8/rquotad.8
-man/${JAMANDIR}/man8/rrestore.8
-man/${JAMANDIR}/man8/rshd.8
-man/${JAMANDIR}/man8/rstatd.8
-man/${JAMANDIR}/man8/rtquery.8
-man/${JAMANDIR}/man8/rusersd.8
-man/${JAMANDIR}/man8/rwalld.8
-man/${JAMANDIR}/man8/rwhod.8
-man/${JAMANDIR}/man8/sa.8
-man/${JAMANDIR}/man8/savecore.8
-man/${JAMANDIR}/man8/scsictl.8
-man/${JAMANDIR}/man8/sendmail.8
-man/${JAMANDIR}/man8/showmount.8
-man/${JAMANDIR}/man8/shutdown.8
-man/${JAMANDIR}/man8/slattach.8
-man/${JAMANDIR}/man8/slip.8
-man/${JAMANDIR}/man8/sliplogin.8
-man/${JAMANDIR}/man8/slstats.8
-man/${JAMANDIR}/man8/spray.8
-man/${JAMANDIR}/man8/sprayd.8
-man/${JAMANDIR}/man8/statd.8
-man/${JAMANDIR}/man8/stdethers.8
-man/${JAMANDIR}/man8/stdhosts.8
-man/${JAMANDIR}/man8/swapctl.8
-man/${JAMANDIR}/man8/swapon.8
-man/${JAMANDIR}/man8/sync.8
-man/${JAMANDIR}/man8/sysctl.8
-man/${JAMANDIR}/man8/syslogd.8
-man/${JAMANDIR}/man8/talkd.8
-man/${JAMANDIR}/man8/tcpdump.8
-man/${JAMANDIR}/man8/telnetd.8
-man/${JAMANDIR}/man8/tftpd.8
-man/${JAMANDIR}/man8/timed.8
-man/${JAMANDIR}/man8/timedc.8
-man/${JAMANDIR}/man8/traceroute.8
-man/${JAMANDIR}/man8/trpt.8
-man/${JAMANDIR}/man8/trsp.8
-man/${JAMANDIR}/man8/ttyflags.8
-man/${JAMANDIR}/man8/tunefs.8
-man/${JAMANDIR}/man8/umount.8
-man/${JAMANDIR}/man8/update.8
-man/${JAMANDIR}/man8/uucico.8
-man/${JAMANDIR}/man8/uucpd.8
-man/${JAMANDIR}/man8/uugetty.8
-man/${JAMANDIR}/man8/uuxqt.8
-man/${JAMANDIR}/man8/vipw.8
-man/${JAMANDIR}/man8/vmstat.8
-man/${JAMANDIR}/man8/vnconfig.8
-man/${JAMANDIR}/man8/wsconsctl.8
-man/${JAMANDIR}/man8/ypbind.8
-man/${JAMANDIR}/man8/ypinit.8
-man/${JAMANDIR}/man8/yppasswdd.8
-man/${JAMANDIR}/man8/yppoll.8
-man/${JAMANDIR}/man8/yppush.8
-man/${JAMANDIR}/man8/ypset.8
-man/${JAMANDIR}/man8/yptest.8
-man/${JAMANDIR}/man9/ETHER_FIRST_MULTI.9
-man/${JAMANDIR}/man9/ETHER_IS_MULTICAST.9
-man/${JAMANDIR}/man9/ETHER_NEXT_MULTI.9
-man/${JAMANDIR}/man9/MCHTYPE.9
-man/${JAMANDIR}/man9/MCLGET.9
-man/${JAMANDIR}/man9/MEXTADD.9
-man/${JAMANDIR}/man9/MEXTMALLOC.9
-man/${JAMANDIR}/man9/MEXTREMOVE.9
-man/${JAMANDIR}/man9/MFREE.9
-man/${JAMANDIR}/man9/MGET.9
-man/${JAMANDIR}/man9/MGETHDR.9
-man/${JAMANDIR}/man9/MH_ALIGN.9
-man/${JAMANDIR}/man9/M_ALIGN.9
-man/${JAMANDIR}/man9/M_COPY_PKTHDR.9
-man/${JAMANDIR}/man9/M_LEADINGSPACE.9
-man/${JAMANDIR}/man9/M_PREPEND.9
-man/${JAMANDIR}/man9/M_TRAILINGSPACE.9
-man/${JAMANDIR}/man9/access.9
-man/${JAMANDIR}/man9/arp.9
-man/${JAMANDIR}/man9/arp_ifinit.9
-man/${JAMANDIR}/man9/arpintr.9
-man/${JAMANDIR}/man9/arpresolve.9
-man/${JAMANDIR}/man9/audio.9
-man/${JAMANDIR}/man9/boottime.9
-man/${JAMANDIR}/man9/bounds_check_with_label.9
-man/${JAMANDIR}/man9/bus_dma.9
-man/${JAMANDIR}/man9/bus_dmamap_create.9
-man/${JAMANDIR}/man9/bus_dmamap_destroy.9
-man/${JAMANDIR}/man9/bus_dmamap_load.9
-man/${JAMANDIR}/man9/bus_dmamap_load_mbuf.9
-man/${JAMANDIR}/man9/bus_dmamap_load_raw.9
-man/${JAMANDIR}/man9/bus_dmamap_load_uio.9
-man/${JAMANDIR}/man9/bus_dmamap_sync.9
-man/${JAMANDIR}/man9/bus_dmamap_unload.9
-man/${JAMANDIR}/man9/bus_dmamem_alloc.9
-man/${JAMANDIR}/man9/bus_dmamem_free.9
-man/${JAMANDIR}/man9/bus_dmamem_map.9
-man/${JAMANDIR}/man9/bus_dmamem_mmap.9
-man/${JAMANDIR}/man9/bus_dmamem_unmap.9
-man/${JAMANDIR}/man9/bus_space.9
-man/${JAMANDIR}/man9/bus_space_alloc.9
-man/${JAMANDIR}/man9/bus_space_barrier.9
-man/${JAMANDIR}/man9/bus_space_copy_region_1.9
-man/${JAMANDIR}/man9/bus_space_copy_region_2.9
-man/${JAMANDIR}/man9/bus_space_copy_region_4.9
-man/${JAMANDIR}/man9/bus_space_copy_region_8.9
-man/${JAMANDIR}/man9/bus_space_free.9
-man/${JAMANDIR}/man9/bus_space_map.9
-man/${JAMANDIR}/man9/bus_space_read_1.9
-man/${JAMANDIR}/man9/bus_space_read_2.9
-man/${JAMANDIR}/man9/bus_space_read_4.9
-man/${JAMANDIR}/man9/bus_space_read_8.9
-man/${JAMANDIR}/man9/bus_space_read_multi_1.9
-man/${JAMANDIR}/man9/bus_space_read_multi_2.9
-man/${JAMANDIR}/man9/bus_space_read_multi_4.9
-man/${JAMANDIR}/man9/bus_space_read_multi_8.9
-man/${JAMANDIR}/man9/bus_space_read_region_1.9
-man/${JAMANDIR}/man9/bus_space_read_region_2.9
-man/${JAMANDIR}/man9/bus_space_read_region_4.9
-man/${JAMANDIR}/man9/bus_space_read_region_8.9
-man/${JAMANDIR}/man9/bus_space_set_region_1.9
-man/${JAMANDIR}/man9/bus_space_set_region_2.9
-man/${JAMANDIR}/man9/bus_space_set_region_4.9
-man/${JAMANDIR}/man9/bus_space_set_region_8.9
-man/${JAMANDIR}/man9/bus_space_subregion.9
-man/${JAMANDIR}/man9/bus_space_unmap.9
-man/${JAMANDIR}/man9/bus_space_write_1.9
-man/${JAMANDIR}/man9/bus_space_write_2.9
-man/${JAMANDIR}/man9/bus_space_write_4.9
-man/${JAMANDIR}/man9/bus_space_write_8.9
-man/${JAMANDIR}/man9/bus_space_write_multi_1.9
-man/${JAMANDIR}/man9/bus_space_write_multi_2.9
-man/${JAMANDIR}/man9/bus_space_write_multi_4.9
-man/${JAMANDIR}/man9/bus_space_write_multi_8.9
-man/${JAMANDIR}/man9/bus_space_write_region_1.9
-man/${JAMANDIR}/man9/bus_space_write_region_2.9
-man/${JAMANDIR}/man9/bus_space_write_region_4.9
-man/${JAMANDIR}/man9/bus_space_write_region_8.9
-man/${JAMANDIR}/man9/cltom.9
-man/${JAMANDIR}/man9/copy.9
-man/${JAMANDIR}/man9/copyin.9
-man/${JAMANDIR}/man9/copyinstr.9
-man/${JAMANDIR}/man9/copyout.9
-man/${JAMANDIR}/man9/copyoutstr.9
-man/${JAMANDIR}/man9/copystr.9
-man/${JAMANDIR}/man9/cpu_reboot.9
-man/${JAMANDIR}/man9/cpu_switch.9
-man/${JAMANDIR}/man9/ctxsw.9
-man/${JAMANDIR}/man9/disk.9
-man/${JAMANDIR}/man9/disk_attach.9
-man/${JAMANDIR}/man9/disk_busy.9
-man/${JAMANDIR}/man9/disk_detatch.9
-man/${JAMANDIR}/man9/disk_find.9
-man/${JAMANDIR}/man9/disk_init.9
-man/${JAMANDIR}/man9/disk_resetstat.9
-man/${JAMANDIR}/man9/disk_unbusy.9
-man/${JAMANDIR}/man9/disklabel.9
-man/${JAMANDIR}/man9/doshutdownhooks.9
-man/${JAMANDIR}/man9/ether_addmulti.9
-man/${JAMANDIR}/man9/ether_delmulti.9
-man/${JAMANDIR}/man9/ether_ifattach.9
-man/${JAMANDIR}/man9/ethersubr.9
-man/${JAMANDIR}/man9/extent.9
-man/${JAMANDIR}/man9/extent_alloc.9
-man/${JAMANDIR}/man9/extent_alloc_region.9
-man/${JAMANDIR}/man9/extent_alloc_subregion.9
-man/${JAMANDIR}/man9/extent_create.9
-man/${JAMANDIR}/man9/extent_destroy.9
-man/${JAMANDIR}/man9/extent_free.9
-man/${JAMANDIR}/man9/extent_print.9
-man/${JAMANDIR}/man9/fddi_addmulti.9
-man/${JAMANDIR}/man9/fddi_delmulti.9
-man/${JAMANDIR}/man9/fddi_ifattach.9
-man/${JAMANDIR}/man9/fetch.9
-man/${JAMANDIR}/man9/fork1.9
-man/${JAMANDIR}/man9/free.9
-man/${JAMANDIR}/man9/fubyte.9
-man/${JAMANDIR}/man9/fuibyte.9
-man/${JAMANDIR}/man9/fuiword.9
-man/${JAMANDIR}/man9/fuswintr.9
-man/${JAMANDIR}/man9/fusword.9
-man/${JAMANDIR}/man9/fuword.9
-man/${JAMANDIR}/man9/gsignal.9
-man/${JAMANDIR}/man9/inittodr.9
-man/${JAMANDIR}/man9/intro.9
-man/${JAMANDIR}/man9/kernacc.9
-man/${JAMANDIR}/man9/log.9
-man/${JAMANDIR}/man9/m_adj.9
-man/${JAMANDIR}/man9/m_cat.9
-man/${JAMANDIR}/man9/m_copyback.9
-man/${JAMANDIR}/man9/m_copydata.9
-man/${JAMANDIR}/man9/m_copym.9
-man/${JAMANDIR}/man9/m_copypacket.9
-man/${JAMANDIR}/man9/m_devget.9
-man/${JAMANDIR}/man9/m_free.9
-man/${JAMANDIR}/man9/m_freem.9
-man/${JAMANDIR}/man9/m_get.9
-man/${JAMANDIR}/man9/m_getclr.9
-man/${JAMANDIR}/man9/m_gethdr.9
-man/${JAMANDIR}/man9/m_prepend.9
-man/${JAMANDIR}/man9/m_pullup.9
-man/${JAMANDIR}/man9/m_split.9
-man/${JAMANDIR}/man9/malloc.9
-man/${JAMANDIR}/man9/mbuf.9
-man/${JAMANDIR}/man9/mi_switch.9
-man/${JAMANDIR}/man9/microtime.9
-man/${JAMANDIR}/man9/mono_time.9
-man/${JAMANDIR}/man9/mtocl.9
-man/${JAMANDIR}/man9/mtod.9
-man/${JAMANDIR}/man9/panic.9
-man/${JAMANDIR}/man9/pfil.9
-man/${JAMANDIR}/man9/pfil_add_hook.9
-man/${JAMANDIR}/man9/pfil_hook_get.9
-man/${JAMANDIR}/man9/pfil_remove_hook.9
-man/${JAMANDIR}/man9/pgsignal.9
-man/${JAMANDIR}/man9/physio.9
-man/${JAMANDIR}/man9/pool.9
-man/${JAMANDIR}/man9/psignal.9
-man/${JAMANDIR}/man9/readdisklabel.9
-man/${JAMANDIR}/man9/resettodr.9
-man/${JAMANDIR}/man9/rnd.9
-man/${JAMANDIR}/man9/rnd_add_data.9
-man/${JAMANDIR}/man9/rnd_add_uint32.9
-man/${JAMANDIR}/man9/rnd_attach_source.9
-man/${JAMANDIR}/man9/rnd_detach_source.9
-man/${JAMANDIR}/man9/rt_timer.9
-man/${JAMANDIR}/man9/rt_timer_add.9
-man/${JAMANDIR}/man9/rt_timer_queue_change.9
-man/${JAMANDIR}/man9/rt_timer_queue_create.9
-man/${JAMANDIR}/man9/rt_timer_queue_destroy.9
-man/${JAMANDIR}/man9/rt_timer_remove_all.9
-man/${JAMANDIR}/man9/runtime.9
-man/${JAMANDIR}/man9/setdisklabel.9
-man/${JAMANDIR}/man9/shutdownhook_disestablish.9
-man/${JAMANDIR}/man9/shutdownhook_establish.9
-man/${JAMANDIR}/man9/sleep.9
-man/${JAMANDIR}/man9/spl.9
-man/${JAMANDIR}/man9/spl0.9
-man/${JAMANDIR}/man9/splbio.9
-man/${JAMANDIR}/man9/splclock.9
-man/${JAMANDIR}/man9/splhigh.9
-man/${JAMANDIR}/man9/splimp.9
-man/${JAMANDIR}/man9/splnet.9
-man/${JAMANDIR}/man9/splsched.9
-man/${JAMANDIR}/man9/splserial.9
-man/${JAMANDIR}/man9/splsoftclock.9
-man/${JAMANDIR}/man9/splsoftnet.9
-man/${JAMANDIR}/man9/splsoftserial.9
-man/${JAMANDIR}/man9/splstatclock.9
-man/${JAMANDIR}/man9/spltty.9
-man/${JAMANDIR}/man9/splx.9
-man/${JAMANDIR}/man9/store.9
-man/${JAMANDIR}/man9/subyte.9
-man/${JAMANDIR}/man9/suibyte.9
-man/${JAMANDIR}/man9/suiword.9
-man/${JAMANDIR}/man9/suswintr.9
-man/${JAMANDIR}/man9/susword.9
-man/${JAMANDIR}/man9/suword.9
-man/${JAMANDIR}/man9/time.9
-man/${JAMANDIR}/man9/timeout.9
-man/${JAMANDIR}/man9/tsleep.9
-man/${JAMANDIR}/man9/uao_create.9
-man/${JAMANDIR}/man9/uao_detach.9
-man/${JAMANDIR}/man9/uao_reference.9
-man/${JAMANDIR}/man9/untimeout.9
-man/${JAMANDIR}/man9/useracc.9
-man/${JAMANDIR}/man9/uvm.9
-man/${JAMANDIR}/man9/uvm_chgkprot.9
-man/${JAMANDIR}/man9/uvm_coredump.9
-man/${JAMANDIR}/man9/uvm_deallocate.9
-man/${JAMANDIR}/man9/uvm_fault.9
-man/${JAMANDIR}/man9/uvm_fork.9
-man/${JAMANDIR}/man9/uvm_grow.9
-man/${JAMANDIR}/man9/uvm_init.9
-man/${JAMANDIR}/man9/uvm_init_limits.9
-man/${JAMANDIR}/man9/uvm_io.9
-man/${JAMANDIR}/man9/uvm_kernacc.9
-man/${JAMANDIR}/man9/uvm_km_alloc.9
-man/${JAMANDIR}/man9/uvm_km_alloc1.9
-man/${JAMANDIR}/man9/uvm_km_free.9
-man/${JAMANDIR}/man9/uvm_km_free_wakeup.9
-man/${JAMANDIR}/man9/uvm_km_kmemalloc.9
-man/${JAMANDIR}/man9/uvm_km_suballoc.9
-man/${JAMANDIR}/man9/uvm_km_valloc.9
-man/${JAMANDIR}/man9/uvm_km_valloc_wait.9
-man/${JAMANDIR}/man9/uvm_km_zalloc.9
-man/${JAMANDIR}/man9/uvm_map.9
-man/${JAMANDIR}/man9/uvm_map_checkprot.9
-man/${JAMANDIR}/man9/uvm_map_pageable.9
-man/${JAMANDIR}/man9/uvm_map_protect.9
-man/${JAMANDIR}/man9/uvm_meter.9
-man/${JAMANDIR}/man9/uvm_page_physload.9
-man/${JAMANDIR}/man9/uvm_pagealloc.9
-man/${JAMANDIR}/man9/uvm_pagefree.9
-man/${JAMANDIR}/man9/uvm_pageout.9
-man/${JAMANDIR}/man9/uvm_pagerealloc.9
-man/${JAMANDIR}/man9/uvm_pglistalloc.9
-man/${JAMANDIR}/man9/uvm_pglistfree.9
-man/${JAMANDIR}/man9/uvm_scheduler.9
-man/${JAMANDIR}/man9/uvm_setpagesize.9
-man/${JAMANDIR}/man9/uvm_swap_init.9
-man/${JAMANDIR}/man9/uvm_swapin.9
-man/${JAMANDIR}/man9/uvm_sysctl.9
-man/${JAMANDIR}/man9/uvm_useracc.9
-man/${JAMANDIR}/man9/uvm_vnp_setsize.9
-man/${JAMANDIR}/man9/uvm_vnp_sync.9
-man/${JAMANDIR}/man9/uvm_vnp_terminate.9
-man/${JAMANDIR}/man9/uvm_vslock.9
-man/${JAMANDIR}/man9/uvm_vsunlock.9
-man/${JAMANDIR}/man9/uvmspace_alloc.9
-man/${JAMANDIR}/man9/uvmspace_exec.9
-man/${JAMANDIR}/man9/uvmspace_fork.9
-man/${JAMANDIR}/man9/uvmspace_free.9
-man/${JAMANDIR}/man9/uvmspace_share.9
-man/${JAMANDIR}/man9/uvmspace_unshare.9
-man/${JAMANDIR}/man9/uvn_attach.9
-man/${JAMANDIR}/man9/vslock.9
-man/${JAMANDIR}/man9/vsunlock.9
-man/${JAMANDIR}/man9/wakeup.9
-man/${JAMANDIR}/man9/writedisklabel.9
-share/doc/jman/README
-@dirrm share/doc/jman
-share/groff/tmac/mdoc/doc-commonj
-share/groff/tmac/mdoc/doc-ditroffj
-share/groff/tmac/mdoc/doc-nroffj
-share/groff/tmac/mdoc/doc-symsj
-share/groff/tmac/tmac.andocj
-share/groff/tmac/tmac.docj
diff --git a/japanese/man/PLIST.x68k b/japanese/man/PLIST.x68k
deleted file mode 100644
index 6d33ef518f3..00000000000
--- a/japanese/man/PLIST.x68k
+++ /dev/null
@@ -1,9 +0,0 @@
-@comment $NetBSD: PLIST.x68k,v 1.1 2001/10/31 23:32:44 zuntum Exp $
-man/${JAMANDIR}/cat1/loadfont.cat1
-man/${JAMANDIR}/cat1/loadkmap.cat1
-man/${JAMANDIR}/cat1/palette.cat1
-man/${JAMANDIR}/cat1/tvctrl.cat1
-man/${JAMANDIR}/man1/loadfont.1
-man/${JAMANDIR}/man1/loadkmap.1
-man/${JAMANDIR}/man1/palette.1
-man/${JAMANDIR}/man1/tvctrl.1
diff --git a/japanese/man/distinfo b/japanese/man/distinfo
deleted file mode 100644
index a4b9855ae22..00000000000
--- a/japanese/man/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 10:13:34 wiz Exp $
-
-SHA1 (NetBSD1.3I-jman-19990531.tar.gz) = 354a23fd50c03de1acc42117d0fa1a6091c67cf0
-Size (NetBSD1.3I-jman-19990531.tar.gz) = 1645123 bytes
-SHA1 (patch-aa) = d7888279176becb0e4e100cca7873fabb9344643
-SHA1 (patch-ab) = 7765340d1e596cfdec4d180c0956a980f42f3a72
-SHA1 (patch-ac) = 2598d46314ba694a227dca3c4d38212da2f64361
-SHA1 (patch-ad) = b608d193a471c8694247fc3650ab1b1a1e75428f
-SHA1 (patch-ae) = 0ddbcea34c2deddff32e8148c8ee23cff6ab7d53
-SHA1 (patch-af) = 41806023d8844395df25b9fb2b53a4cf767a5ffd
diff --git a/japanese/man/patches/patch-aa b/japanese/man/patches/patch-aa
deleted file mode 100644
index 3fe7740905e..00000000000
--- a/japanese/man/patches/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/06/08 10:01:21 sakamoto Exp $
---- ./jman/jman.sh.orig Wed Oct 4 04:53:42 1995
-+++ ./jman/jman.sh Mon May 31 16:18:47 1999
-@@ -1,5 +1,5 @@
- #! /bin/sh
-
--PAGER=${PAGER:-/usr/local/bin/less} ;export PAGER
-+PAGER=${PAGER:-${BINDIR}/jless} ;export PAGER
- #LESSCHARSET=jis-euc ;export LESSCHARSET
--exec /usr/bin/man -C /etc/jman.conf $*
-+exec /usr/bin/man -C ${JMANCONFDIR}/jman.conf $*
diff --git a/japanese/man/patches/patch-ab b/japanese/man/patches/patch-ab
deleted file mode 100644
index ec893fa56fc..00000000000
--- a/japanese/man/patches/patch-ab
+++ /dev/null
@@ -1,73 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2001/01/15 14:02:51 kei Exp $
---- jman/jman.conf.orig Thu Jan 28 07:16:18 1999
-+++ jman/jman.conf Tue Nov 2 18:30:01 1999
-@@ -6,7 +6,7 @@
- # The whatis/apropos database.
- _whatdb /usr/share/man/whatis.db
--_whatdb /usr/X11R6/man/whatis.db
-+_whatdb ${X11BASE}/man/whatis.db
- _whatdb /usr/X11/man/whatis.db
--_whatdb /usr/pkg/man/whatis.db
-+_whatdb ${LOCALBASE}/man/whatis.db
- _whatdb /usr/local/man/whatis.db
-
-@@ -19,12 +19,12 @@
- _build .0.Z /usr/bin/zcat %s
- _build .0.gz /usr/bin/gunzip -c %s
--_build .[1-9ln] /usr/local/bin/nroff -Tnippon -man %s
--_build .[1-9ln].Z /usr/bin/zcat %s | /usr/local/bin/nroff -Tnippon -man
--_build .[1-9ln].gz /usr/bin/gunzip -c %s | /usr/local/bin/nroff -Tnippon -man
--_build .tbl /usr/local/bin/tbl %s | /usr/local/bin/nroff -Tnippon -man
--_build .tbl.Z /usr/bin/zcat %s | /usr/local/bin/tbl | /usr/local/bin/nroff -Tnippon -man
--_build .tbl.gz /usr/bin/gunzip -c %s | /usr/local/bin/tbl | /usr/local/bin/nroff -Tnippon -man
--_build .n /usr/local/bin/nroff -Tnippon -me %s 2>/dev/null | cat -s
--_build .me /usr/local/bin/nroff -Tnippon -me %s 2>/dev/null | cat -s
-+_build .[1-9ln] ${PREFIX}/bin/jgnroff -Tnippon -mandocj %s
-+_build .[1-9ln].Z /usr/bin/zcat %s | ${PREFIX}/bin/jgnroff -Tnippon -mandocj
-+_build .[1-9ln].gz /usr/bin/gunzip -c %s | ${PREFIX}/bin/jgnroff -Tnippon -mandocj
-+_build .tbl ${PREFIX}/bin/jgtbl %s | ${PREFIX}/bin/jgnroff -Tnippon -mandocj
-+_build .tbl.Z /usr/bin/zcat %s | ${PREFIX}/bin/jgtbl | ${PREFIX}/bin/jgnroff -Tnippon -mandocj
-+_build .tbl.gz /usr/bin/gunzip -c %s | ${PREFIX}/bin/jgtbl | ${PREFIX}/bin/jgnroff -Tnippon -mandocj
-+_build .n ${PREFIX}/bin/jgnroff -Tnippon -me %s 2>/dev/null | cat -s
-+_build .me ${PREFIX}/bin/jgnroff -Tnippon -me %s 2>/dev/null | cat -s
-
- # Sections and their directories.
-@@ -33,10 +33,10 @@
-
- # default
--_default /usr/local/jman/ /usr/{share,X11R6,X11,pkg,local}/man/
-+_default {${LOCALBASE},${X11BASE}}/{man/${JAMANDIR}/,man/} /usr/{share,X11,local}/man/
-
- # Other sections that represent complete man subdirectories.
--X11R6 /usr/X11R6/man/
-+X11R6 ${X11BASE}/man/
- X11 /usr/X11/man/
--packages /usr/pkg/man/
-+packages ${LOCALBASE}/man/
- local /usr/local/man/
-
-@@ -44,15 +44,15 @@
-
- # Specific section/directory combinations.
--1 /usr/{local,share,X11R6,X11,pkg}/{jman/,man/}{cat,man}1
--2 /usr/{local,share,X11R6,X11,pkg}/{jman/,man/}{cat,man}2
--3 /usr/{local,share,X11R6,X11,pkg}/{jman/,man/}{cat,man}3
-+1 {${LOCALBASE},${X11BASE},/usr/local,/usr/share,/usr/X11}/{man/${JAMANDIR},man}/{cat,man}1
-+2 {${LOCALBASE},${X11BASE},/usr/local,/usr/share,/usr/X11}/{man/${JAMANDIR},man}/{cat,man}2
-+3 {${LOCALBASE},${X11BASE},/usr/local,/usr/share,/usr/X11}/{man/${JAMANDIR},man}/{cat,man}3
- 3F /usr/local/man/cat3f
- 3f /usr/local/man/cat3f
--4 /usr/{local,share,X11R6,X11,pkg}/{jman/,man/}{cat,man}4
--5 /usr/{local,share,X11R6,X11,pkg}/{jman/,man/}{cat,man}5
--6 /usr/{local,share,X11R6,X11,pkg}/{jman/,man/}{cat,man}6
--7 /usr/{local,share,X11R6,X11,pkg}/{jman/,man/}{cat,man}7
--8 /usr/{local,share,X11R6,X11,pkg}/{jman/,man/}{cat,man}8
--9 /usr/{local,share}/{jman/,man/}{cat,man}9
-+4 {${LOCALBASE},${X11BASE},/usr/local,/usr/share,/usr/X11}/{man/${JAMANDIR},man}/{cat,man}4
-+5 {${LOCALBASE},${X11BASE},/usr/local,/usr/share,/usr/X11}/{man/${JAMANDIR},man}/{cat,man}5
-+6 {${LOCALBASE},${X11BASE},/usr/local,/usr/share,/usr/X11}/{man/${JAMANDIR},man}/{cat,man}6
-+7 {${LOCALBASE},${X11BASE},/usr/local,/usr/share,/usr/X11}/{man/${JAMANDIR},man}/{cat,man}7
-+8 {${LOCALBASE},${X11BASE},/usr/local,/usr/share,/usr/X11R6,/usr/X11,/usr/pkg}/{man/${JAMANDIR},man}/{cat,man}8
-+9 {${LOCALBASE},/usr/share}/{man/${JAMANDIR},man}/{cat,man}9
- l /usr/{X11R6,X11,pkg,local}/man/{cat,man}l
- n /usr/{X11R6,X11,pkg,local}/man/{cat,man}n
diff --git a/japanese/man/patches/patch-ac b/japanese/man/patches/patch-ac
deleted file mode 100644
index ea0a291952e..00000000000
--- a/japanese/man/patches/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.2 1999/11/02 11:11:43 sakamoto Exp $
---- ./man/Makefile.inc.orig Tue Jul 28 01:25:43 1998
-+++ ./man/Makefile.inc Mon May 31 16:18:47 1999
-@@ -1,9 +1,9 @@
--NROFF= nroff -Tnippon
--MANDIR= ${DESTDIR}/usr/local/jman
--TMACDIR= ${DESTDIR}/usr/local/share/groff/tmac
--CATDEPS= ${TMACDIR}/tmac.andoc \
-- ${TMACDIR}/tmac.doc \
-- ${TMACDIR}/mdoc/doc-ditroff \
-- ${TMACDIR}/mdoc/doc-common \
-- ${TMACDIR}/mdoc/doc-nroff \
-- ${TMACDIR}/mdoc/doc-syms
-+NROFF= jgnroff -Tnippon
-+MANDIR= ${PREFIX}/man/${JAMANDIR}
-+TMACDIR= ${PREFIX}/share/groff/tmac
-+CATDEPS= ${TMACDIR}/tmac.andocj \
-+ ${TMACDIR}/tmac.docj \
-+ ${TMACDIR}/mdoc/doc-ditroffj \
-+ ${TMACDIR}/mdoc/doc-commonj \
-+ ${TMACDIR}/mdoc/doc-nroffj \
-+ ${TMACDIR}/mdoc/doc-symsj
diff --git a/japanese/man/patches/patch-ad b/japanese/man/patches/patch-ad
deleted file mode 100644
index e17ebba2189..00000000000
--- a/japanese/man/patches/patch-ad
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 1999/06/08 10:01:21 sakamoto Exp $
---- ./man/Makefile.orig Thu Jan 28 07:23:34 1999
-+++ ./man/Makefile Mon May 31 16:18:47 1999
-@@ -9,6 +9,3 @@
- .endif
-
--beforeinstall:
-- mtree -def jmantree -p ${DESTDIR}/usr/local -u
--
- .include <bsd.subdir.mk>
diff --git a/japanese/man/patches/patch-ae b/japanese/man/patches/patch-ae
deleted file mode 100644
index 014e5db2d0f..00000000000
--- a/japanese/man/patches/patch-ae
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 1999/06/08 10:01:21 sakamoto Exp $
---- ./tmac.andoc.orig Mon May 31 14:48:43 1999
-+++ ./tmac.andoc Mon May 31 16:18:47 1999
-@@ -3,5 +3,5 @@
- .de Dd
- .rm Dd
--.do mso tmac.doc
-+.do mso tmac.docj
- \\*(Dd\\
- ..
diff --git a/japanese/man/patches/patch-af b/japanese/man/patches/patch-af
deleted file mode 100644
index 95e83f059ab..00000000000
--- a/japanese/man/patches/patch-af
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 1999/06/08 10:01:21 sakamoto Exp $
---- ./tmac.doc.orig Mon May 31 14:48:43 1999
-+++ ./tmac.doc Mon May 31 16:18:47 1999
-@@ -50,11 +50,11 @@
- ..
- .if t \{\
--. sO doc-ditroff
-+. sO doc-ditroffj
- .\}
- .if n \{\
--. sO doc-nroff
-+. sO doc-nroffj
- .\}
--.sO doc-common
--.sO doc-syms
-+.sO doc-commonj
-+.sO doc-symsj
- .nr Db 0
- .de Db
diff --git a/japanese/mh/DESCR b/japanese/mh/DESCR
deleted file mode 100644
index 93fd4d0f3fa..00000000000
--- a/japanese/mh/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-This is the MH mail user agent (reader/sender) with Japanese patches,
-a command line based mail reader that is powerful and extensible. MH
-is an excellent choice for people who receive and process a LOT of mail.
diff --git a/japanese/mh/Makefile b/japanese/mh/Makefile
deleted file mode 100644
index 93bf92bfe41..00000000000
--- a/japanese/mh/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# $NetBSD: Makefile,v 1.12 2001/09/27 23:18:14 jlam Exp $
-# FreeBSD Id: Makefile,v 1.13 1999/02/10 18:13:21 motoyuki Exp $
-
-DISTNAME= mh-6.8.4-JP-3.03
-PKGNAME= ja-mh6-3.03
-CATEGORIES= japanese mail
-MASTER_SITES= ftp://ports.jp.freebsd.org/pub/FreeBSD-jp/ports-jp/LOCAL_PORTS/ \
- ftp://komadori.planet.sci.kobe-u.ac.jp/pub/MH/ \
- ftp://ftp.chem.eng.himeji-tech.ac.jp/pub/net/mh/
-
-MAINTAINER= tech-pkg-ja@jp.netbsd.org
-COMMENT= Rand MH mail handling system + Japanese patches
-
-DEPENDS= ja-less>=332:../../japanese/less
-
-CONFLICTS= nmh-[0-9]* ja-mh-*_JP_*
-
-.include "../../mk/bsd.prefs.mk"
-
-MANCOMPRESSED= yes
-GNU_CONFIGURE= yes
-CONFIGURE_ENV+= OBJECT_FMT=${OBJECT_FMT}
-CONFIGURE_ARGS= --enable-batchmode \
- --libexecdir=${PREFIX}/libexec/mh \
- --enable-jmandir=${PREFIX}/man/ja_JP.EUC \
- --enable-apop=${PREFIX}/etc/pop.auth --enable-rpop
-
-post-install:
- ${LN} -sf libmh.so.3.2 ${PREFIX}/lib/libmh.so.3
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/japanese/mh/PLIST b/japanese/mh/PLIST
deleted file mode 100644
index c0ac717c907..00000000000
--- a/japanese/mh/PLIST
+++ /dev/null
@@ -1,176 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:29:19 zuntum Exp $
-bin/ali
-bin/anno
-bin/bbc
-bin/burst
-bin/comp
-bin/dist
-bin/folder
-bin/folders
-bin/forw
-bin/inc
-bin/mark
-bin/mhmail
-bin/mhn
-bin/mhparam
-bin/mhpath
-bin/msgchk
-bin/msh
-bin/next
-bin/packf
-bin/pgped
-bin/pgpshow
-bin/pick
-bin/prev
-bin/prompter
-bin/refile
-bin/repl
-bin/rmf
-bin/rmm
-bin/scan
-bin/send
-bin/show
-bin/sortm
-bin/whatnow
-bin/whom
-lib/libmh.so
-lib/libmh.so.3
-lib/libmh.so.3.2
-libexec/mh/MailAliases
-libexec/mh/ap
-libexec/mh/components
-libexec/mh/conflict
-libexec/mh/digestcomps
-libexec/mh/distcomps
-libexec/mh/dp
-libexec/mh/fmtdump
-libexec/mh/forwcomps
-libexec/mh/install-mh
-libexec/mh/mhl
-libexec/mh/mhl.body
-libexec/mh/mhl.digest
-libexec/mh/mhl.format
-libexec/mh/mhl.forward
-libexec/mh/mhl.headers
-libexec/mh/mhn_defaults
-libexec/mh/mtstailor
-libexec/mh/packmbox
-libexec/mh/post
-libexec/mh/rcvdist
-libexec/mh/rcvdistcomps
-libexec/mh/rcvpack
-libexec/mh/rcvstore
-libexec/mh/rcvtty
-libexec/mh/replcomps
-libexec/mh/scan.default
-libexec/mh/scan.mailx
-libexec/mh/scan.size
-libexec/mh/scan.time
-libexec/mh/scan.timely
-libexec/mh/slocal
-libexec/mh/spost
-libexec/mh/tmac.h
-libexec/mh/viamail
-man/ja_JP.EUC/man1/ali.1
-man/ja_JP.EUC/man1/anno.1
-man/ja_JP.EUC/man1/bbc.1
-man/ja_JP.EUC/man1/burst.1
-man/ja_JP.EUC/man1/comp.1
-man/ja_JP.EUC/man1/dist.1
-man/ja_JP.EUC/man1/folder.1
-man/ja_JP.EUC/man1/forw.1
-man/ja_JP.EUC/man1/inc.1
-man/ja_JP.EUC/man1/mark.1
-man/ja_JP.EUC/man1/mh-chart.1
-man/ja_JP.EUC/man1/mh.1
-man/ja_JP.EUC/man1/mhl.1
-man/ja_JP.EUC/man1/mhmail.1
-man/ja_JP.EUC/man1/mhn.1
-man/ja_JP.EUC/man1/mhook.1
-man/ja_JP.EUC/man1/mhparam.1
-man/ja_JP.EUC/man1/mhpath.1
-man/ja_JP.EUC/man1/msgchk.1
-man/ja_JP.EUC/man1/msh.1
-man/ja_JP.EUC/man1/next.1
-man/ja_JP.EUC/man1/packf.1
-man/ja_JP.EUC/man1/pgped.1
-man/ja_JP.EUC/man1/pick.1
-man/ja_JP.EUC/man1/prev.1
-man/ja_JP.EUC/man1/prompter.1
-man/ja_JP.EUC/man1/rcvstore.1
-man/ja_JP.EUC/man1/refile.1
-man/ja_JP.EUC/man1/repl.1
-man/ja_JP.EUC/man1/rmf.1
-man/ja_JP.EUC/man1/rmm.1
-man/ja_JP.EUC/man1/scan.1
-man/ja_JP.EUC/man1/send.1
-man/ja_JP.EUC/man1/show.1
-man/ja_JP.EUC/man1/slocal.1
-man/ja_JP.EUC/man1/sortm.1
-man/ja_JP.EUC/man1/vmh.1
-man/ja_JP.EUC/man1/whatnow.1
-man/ja_JP.EUC/man1/whom.1
-man/ja_JP.EUC/man5/mh-alias.5
-man/ja_JP.EUC/man5/mh-format.5
-man/ja_JP.EUC/man5/mh-mail.5
-man/ja_JP.EUC/man5/mh-profile.5
-man/ja_JP.EUC/man5/mh-sequence.5
-man/ja_JP.EUC/man5/mh-tailor.5
-man/ja_JP.EUC/man8/ap.8
-man/ja_JP.EUC/man8/conflict.8
-man/ja_JP.EUC/man8/dp.8
-man/ja_JP.EUC/man8/fmtdump.8
-man/ja_JP.EUC/man8/install-mh.8
-man/ja_JP.EUC/man8/post.8
-man/man1/ali.1
-man/man1/anno.1
-man/man1/bbc.1
-man/man1/burst.1
-man/man1/comp.1
-man/man1/dist.1
-man/man1/folder.1
-man/man1/forw.1
-man/man1/inc.1
-man/man1/mark.1
-man/man1/mh-chart.1
-man/man1/mh.1
-man/man1/mhl.1
-man/man1/mhmail.1
-man/man1/mhn.1
-man/man1/mhook.1
-man/man1/mhparam.1
-man/man1/mhpath.1
-man/man1/msgchk.1
-man/man1/msh.1
-man/man1/next.1
-man/man1/packf.1
-man/man1/pgped.1
-man/man1/pick.1
-man/man1/prev.1
-man/man1/prompter.1
-man/man1/rcvstore.1
-man/man1/refile.1
-man/man1/repl.1
-man/man1/rmf.1
-man/man1/rmm.1
-man/man1/scan.1
-man/man1/send.1
-man/man1/show.1
-man/man1/slocal.1
-man/man1/sortm.1
-man/man1/vmh.1
-man/man1/whatnow.1
-man/man1/whom.1
-man/man5/mh-alias.5
-man/man5/mh-format.5
-man/man5/mh-mail.5
-man/man5/mh-profile.5
-man/man5/mh-sequence.5
-man/man5/mh-tailor.5
-man/man8/ap.8
-man/man8/conflict.8
-man/man8/dp.8
-man/man8/fmtdump.8
-man/man8/install-mh.8
-man/man8/post.8
-@dirrm libexec/mh
diff --git a/japanese/mh/distinfo b/japanese/mh/distinfo
deleted file mode 100644
index 5cd81ea71fb..00000000000
--- a/japanese/mh/distinfo
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 10:13:34 wiz Exp $
-
-SHA1 (mh-6.8.4-JP-3.03.tar.gz) = e533b22c23e79e8cba50ed2fe391f0f3b3ca332a
-Size (mh-6.8.4-JP-3.03.tar.gz) = 1567712 bytes
-SHA1 (patch-aa) = d38c2340f53ddfafb63857a7c6cbf95f8ba91cbf
-SHA1 (patch-ab) = 6ba17b9bb6844bbf5fc3d4edf268b7d671427438
-SHA1 (patch-ac) = aea3d9bdfb5faa42ec55af92c5b1d5cd74f3d42d
-SHA1 (patch-ad) = 5d1e3f54abbb114bf5d3c367de1b186b8dd39317
-SHA1 (patch-ae) = 183afc6c35c04912986bb3826d9d443b0aaacb7f
-SHA1 (patch-af) = 0f9dd68449f56039555253a8e1ba9a2923c5ef4e
-SHA1 (patch-ag) = 5e68e06be4ff523335900b2dd01defbe84cd725c
-SHA1 (patch-ah) = 3cabf8ae640fbce889dda69521453dc0a9e621f5
-SHA1 (patch-ai) = c9da909f7783f6600a21ac6f035b8df732275539
-SHA1 (patch-aj) = 418b6e60541558f2702393b89df76ad9edf1774f
-SHA1 (patch-ak) = 7f8442f265111a4b87393b3a64fd8692c23b379d
-SHA1 (patch-al) = 6f37a26a389689ca3b82900cf15ceea5b0f291ce
-SHA1 (patch-am) = 3cea349883c6e73d95844a44586d32c0046eb94c
-SHA1 (patch-an) = c879444e422531fc2c3d2a6bd4c52c9680239a5f
-SHA1 (patch-ao) = 4ad1798a6d4cdc2c977dd5186e9a111a4585df94
-SHA1 (patch-ap) = bde44e5f75ee1e124b5fff9679823e1ee2c313f0
-SHA1 (patch-aq) = e9399fe4a26005be428960666ac7ac437789aaa5
-SHA1 (patch-ar) = 3f9a0e510c9649ac07f07ef86f4a139bba1a5055
diff --git a/japanese/mh/patches/patch-aa b/japanese/mh/patches/patch-aa
deleted file mode 100644
index e1b0be987df..00000000000
--- a/japanese/mh/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.4 1999/11/01 10:23:45 sakamoto Exp $
-
---- ./sbr/m_getdefs.c.orig Wed Dec 2 02:05:00 1998
-+++ ./sbr/m_getdefs.c Mon Nov 1 19:13:29 1999
-@@ -7,4 +7,7 @@
- #include <stdio.h>
- #include <errno.h>
-+#ifdef UNISTD
-+#include <unistd.h>
-+#endif
- #include <sys/types.h>
- #include <sys/stat.h>
diff --git a/japanese/mh/patches/patch-ab b/japanese/mh/patches/patch-ab
deleted file mode 100644
index 4c142610663..00000000000
--- a/japanese/mh/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.4 1999/11/01 10:23:45 sakamoto Exp $
-
---- ./sbr/refile.c.orig Wed Dec 1 13:01:26 1993
-+++ ./sbr/refile.c Mon Nov 1 19:13:30 1999
-@@ -6,4 +6,7 @@
- #include "../h/mh.h"
- #include <stdio.h>
-+#ifdef UNISTD
-+#include <unistd.h>
-+#endif
-
- int refile (arg, file)
diff --git a/japanese/mh/patches/patch-ac b/japanese/mh/patches/patch-ac
deleted file mode 100644
index c7a3f0b2909..00000000000
--- a/japanese/mh/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.1 1999/11/01 10:23:45 sakamoto Exp $
-
---- ./sbr/remdir.c.orig Fri Apr 24 06:02:00 1998
-+++ ./sbr/remdir.c Mon Nov 1 19:13:30 1999
-@@ -6,4 +6,7 @@
- #include "../h/mh.h"
- #include <stdio.h>
-+#ifdef UNISTD
-+#include <unistd.h>
-+#endif
-
-
diff --git a/japanese/mh/patches/patch-ad b/japanese/mh/patches/patch-ad
deleted file mode 100644
index 91a7757df37..00000000000
--- a/japanese/mh/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.1 1999/11/01 10:23:45 sakamoto Exp $
-
---- ./sbr/showfile.c.orig Wed Dec 1 13:01:26 1993
-+++ ./sbr/showfile.c Mon Nov 1 19:13:30 1999
-@@ -3,4 +3,7 @@
- #include "../h/mh.h"
- #include <stdio.h>
-+#ifdef UNISTD
-+#include <unistd.h>
-+#endif
-
-
diff --git a/japanese/mh/patches/patch-ae b/japanese/mh/patches/patch-ae
deleted file mode 100644
index cdfa26702e4..00000000000
--- a/japanese/mh/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.1 1999/11/01 10:23:45 sakamoto Exp $
-
---- ./uip/inc.c.orig Fri Sep 10 02:10:53 1999
-+++ ./uip/inc.c Mon Nov 1 19:13:30 1999
-@@ -38,4 +38,7 @@
- #include <locale.h>
- #endif
-+#ifdef UNISTD
-+#include <unistd.h>
-+#endif
-
- /* */
diff --git a/japanese/mh/patches/patch-af b/japanese/mh/patches/patch-af
deleted file mode 100644
index e56890ed451..00000000000
--- a/japanese/mh/patches/patch-af
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-af,v 1.1 1999/11/01 10:23:45 sakamoto Exp $
-
---- ./uip/mhlsbr.c.orig Tue Feb 9 20:30:00 1999
-+++ ./uip/mhlsbr.c Mon Nov 1 19:13:30 1999
-@@ -21,4 +21,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
-+#ifdef UNISTD
-+#include <unistd.h>
-+#endif
-
-
diff --git a/japanese/mh/patches/patch-ag b/japanese/mh/patches/patch-ag
deleted file mode 100644
index 6a9698e8ddb..00000000000
--- a/japanese/mh/patches/patch-ag
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ag,v 1.1 1999/11/01 10:23:45 sakamoto Exp $
-
---- ./uip/mhn.c.orig Tue Feb 9 20:30:00 1999
-+++ ./uip/mhn.c Mon Nov 1 19:13:30 1999
-@@ -19,4 +19,7 @@
- #include <locale.h>
- #endif
-+#ifdef UNISTD
-+#include <unistd.h>
-+#endif
-
- /* */
diff --git a/japanese/mh/patches/patch-ah b/japanese/mh/patches/patch-ah
deleted file mode 100644
index b26983a9525..00000000000
--- a/japanese/mh/patches/patch-ah
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ah,v 1.1 1999/11/01 10:23:45 sakamoto Exp $
-
---- ./uip/rcvtty.c.orig Tue Feb 9 20:30:00 1999
-+++ ./uip/rcvtty.c Mon Nov 1 19:13:30 1999
-@@ -30,4 +30,7 @@
- #include <locale.h>
- #endif
-+#ifdef UNISTD
-+#include <unistd.h>
-+#endif
-
- /* */
diff --git a/japanese/mh/patches/patch-ai b/japanese/mh/patches/patch-ai
deleted file mode 100644
index 47a0289c3e8..00000000000
--- a/japanese/mh/patches/patch-ai
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ai,v 1.1 1999/11/01 10:23:45 sakamoto Exp $
-
---- ./uip/replsbr.c.orig Fri Sep 10 13:51:41 1999
-+++ ./uip/replsbr.c Mon Nov 1 19:13:30 1999
-@@ -11,4 +11,7 @@
- #include <sys/types.h> /* off_t */
- #include <sys/file.h> /* L_SET */
-+#ifdef UNISTD
-+#include <unistd.h>
-+#endif
-
-
diff --git a/japanese/mh/patches/patch-aj b/japanese/mh/patches/patch-aj
deleted file mode 100644
index aa01c40f1fd..00000000000
--- a/japanese/mh/patches/patch-aj
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aj,v 1.1 1999/11/01 10:23:45 sakamoto Exp $
-
---- ./uip/sendsbr.c.orig Tue Feb 9 20:30:00 1999
-+++ ./uip/sendsbr.c Mon Nov 1 19:13:30 1999
-@@ -10,4 +10,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
-+#ifdef UNISTD
-+#include <unistd.h>
-+#endif
-
- static alert(), anno(), annoaux();
diff --git a/japanese/mh/patches/patch-ak b/japanese/mh/patches/patch-ak
deleted file mode 100644
index 300cfc1ffc3..00000000000
--- a/japanese/mh/patches/patch-ak
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ak,v 1.1 1999/11/01 10:23:45 sakamoto Exp $
-
---- ./uip/spost.c.orig Wed Dec 2 02:05:00 1998
-+++ ./uip/spost.c Mon Nov 1 19:13:30 1999
-@@ -23,4 +23,7 @@
- #include <locale.h>
- #endif
-+#ifdef UNISTD
-+#include <unistd.h>
-+#endif
-
- extern char *getfullname (), *getusr ();
diff --git a/japanese/mh/patches/patch-al b/japanese/mh/patches/patch-al
deleted file mode 100644
index b140ed7c8c8..00000000000
--- a/japanese/mh/patches/patch-al
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-al,v 1.2 2000/02/29 15:28:49 minoura Exp $
-
---- ./uip/vmh.c.orig Tue Feb 9 20:30:00 1999
-+++ ./uip/vmh.c Tue Feb 29 23:19:05 2000
-@@ -23,6 +23,9 @@
- If curses ever gets fixed, then XYZ code can be removed
- */
-
-+#ifdef UNISTD
-+#include <unistd.h>
-+#endif
- #ifdef __osf__
- #define _BSD
- #endif
-@@ -85,9 +88,15 @@
- #define _maxy maxy
- #define _curx curx /* curses.h */
- #define _cury cury
-+#ifndef __NetBSD__
- void __cputchar __P((int));
-+#endif
- #undef _putchar
-+#ifdef BSD44
-+#define _putchar __cputchar
-+#else
- #define _putchar (int (*)()) __cputchar
-+#endif
- #include <sys/ioctl.h> /* sgttyb */
- #endif /* !__NCURSES_H && (BSD44 || linux) */
-
-@@ -1509,7 +1518,7 @@
- tpgrp;
- TYPESIG (*tstat) ();
-
-- if ((pgrp = getpgrp (0)) == NOTOK)
-+ if ((pgrp = getpgrp (/*0*/)) == NOTOK)
- adios ("process group", "unable to determine");
- for (;;) {
- if (ioctl (fileno (stdin), TIOCGPGRP, (char *) &tpgrp) == NOTOK)
diff --git a/japanese/mh/patches/patch-am b/japanese/mh/patches/patch-am
deleted file mode 100644
index 152b6d45896..00000000000
--- a/japanese/mh/patches/patch-am
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-am,v 1.1 1999/11/01 10:23:46 sakamoto Exp $
-
---- ./uip/vmhtest.c.orig Fri Apr 24 06:02:00 1998
-+++ ./uip/vmhtest.c Mon Nov 1 19:13:30 1999
-@@ -11,4 +11,7 @@
- #include <locale.h>
- #endif
-+#ifdef UNISTD
-+#include <unistd.h>
-+#endif
-
- /* */
diff --git a/japanese/mh/patches/patch-an b/japanese/mh/patches/patch-an
deleted file mode 100644
index 1d911632adf..00000000000
--- a/japanese/mh/patches/patch-an
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-an,v 1.1 1999/11/01 10:23:46 sakamoto Exp $
-
---- ./uip/whatnowsbr.c.orig Tue Feb 9 20:30:00 1999
-+++ ./uip/whatnowsbr.c Mon Nov 1 19:13:30 1999
-@@ -9,4 +9,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
-+#ifdef UNISTD
-+#include <unistd.h>
-+#endif
-
- #ifndef MIME
diff --git a/japanese/mh/patches/patch-ao b/japanese/mh/patches/patch-ao
deleted file mode 100644
index c543832e8b9..00000000000
--- a/japanese/mh/patches/patch-ao
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ao,v 1.1 1999/11/01 10:23:46 sakamoto Exp $
-
---- ./uip/wmh.c.orig Fri Apr 24 06:02:00 1998
-+++ ./uip/wmh.c Mon Nov 1 19:13:30 1999
-@@ -29,4 +29,7 @@
- #include <locale.h>
- #endif
-+#ifdef UNISTD
-+#include <unistd.h>
-+#endif
-
-
diff --git a/japanese/mh/patches/patch-ap b/japanese/mh/patches/patch-ap
deleted file mode 100644
index b2873ae5536..00000000000
--- a/japanese/mh/patches/patch-ap
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ap,v 1.1 1999/11/01 10:23:46 sakamoto Exp $
-
---- ./configure.in.orig Fri Oct 1 23:01:15 1999
-+++ ./configure.in Mon Nov 1 19:08:09 1999
-@@ -354,4 +354,8 @@
- fi
- fi
-+ if test "$OBJECT_FMT" = ELF
-+ then
-+ sharedlib=gnuelf
-+ fi
- slflags="-fpic"
- slibdir=$libdir
diff --git a/japanese/mh/patches/patch-aq b/japanese/mh/patches/patch-aq
deleted file mode 100644
index d522796bee7..00000000000
--- a/japanese/mh/patches/patch-aq
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aq,v 1.1 1999/11/01 10:23:46 sakamoto Exp $
-
---- ./configure.orig Fri Oct 1 23:01:45 1999
-+++ ./configure Mon Nov 1 19:08:09 1999
-@@ -1386,4 +1386,8 @@
- fi
- fi
-+ if test "$OBJECT_FMT" = ELF
-+ then
-+ sharedlib=gnuelf
-+ fi
- slflags="-fpic"
- slibdir=$libdir
diff --git a/japanese/mh/patches/patch-ar b/japanese/mh/patches/patch-ar
deleted file mode 100644
index 0a04324d4e6..00000000000
--- a/japanese/mh/patches/patch-ar
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ar,v 1.1 2000/02/29 15:29:42 minoura Exp $
-
---- ./zotnet/mts/client.c.orig Fri Sep 10 14:47:56 1999
-+++ ./zotnet/mts/client.c Tue Feb 29 22:38:35 2000
-@@ -360,7 +360,8 @@
- /* taken from ISODE's compat/internet.c */
-
- #if !defined(SOLARIS) && !defined(linux) && !defined(__bsdi__) && \
-- !defined(OSF1) && !defined(__osf__) && !defined(__FreeBSD__)
-+ !defined(OSF1) && !defined(__osf__) && !defined(__FreeBSD__) && \
-+ !defined(__NetBSD__)
- #ifndef DG
- #ifndef __alpha
- u_long inet_addr ();
diff --git a/japanese/mknmz-wwwoffle/DESCR b/japanese/mknmz-wwwoffle/DESCR
deleted file mode 100644
index 369310b4173..00000000000
--- a/japanese/mknmz-wwwoffle/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-mknmz-wwwoffle enables namazu to handle wwwoffle's HTTP cache index
-directory.
diff --git a/japanese/mknmz-wwwoffle/Makefile b/japanese/mknmz-wwwoffle/Makefile
deleted file mode 100644
index 1b3c226db7f..00000000000
--- a/japanese/mknmz-wwwoffle/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/02/20 10:09:02 kei Exp $
-#
-
-DISTNAME= mknmz-wwwoffle-0.7.0
-CATEGORIES= japanese
-MASTER_SITES= http://www.naney.org/comp/distrib/mknmz-wwwoffle/archive/
-
-MAINTAINER= kei@netbsd.org
-HOMEPAGE= http://www.naney.org/comp/distrib/mknmz-wwwoffle/index.html
-COMMENT= full text indexing and searching system for wwwoffle's cache directory
-
-DEPENDS+= namazu>=2.0.5:../../japanese/namazu2
-DEPENDS+= wwwoffle>=2.6:../../www/wwwoffle
-
-USE_PERL5= # defined
-GNU_CONFIGURE= # defined
-CONFIG_ARGS+= --prefix=${PREFIX}/share/namazu
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/japanese/mknmz-wwwoffle/PLIST b/japanese/mknmz-wwwoffle/PLIST
deleted file mode 100644
index dcd75088d9d..00000000000
--- a/japanese/mknmz-wwwoffle/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:29:22 zuntum Exp $
-bin/mknmz-wwwoffle
-man/man1/mknmz-wwwoffle.1
-share/namazu/filter/wwwofflecache.pl
diff --git a/japanese/mknmz-wwwoffle/distinfo b/japanese/mknmz-wwwoffle/distinfo
deleted file mode 100644
index 5ceb94da7e9..00000000000
--- a/japanese/mknmz-wwwoffle/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 10:13:34 wiz Exp $
-
-SHA1 (mknmz-wwwoffle-0.7.0.tar.gz) = e1afdf5f753ff1daed51c2b961357b73268e707a
-Size (mknmz-wwwoffle-0.7.0.tar.gz) = 45777 bytes
diff --git a/japanese/namazu1/DEINSTALL b/japanese/namazu1/DEINSTALL
deleted file mode 100644
index bca915ee83b..00000000000
--- a/japanese/namazu1/DEINSTALL
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: DEINSTALL,v 1.1 2001/10/31 23:29:24 zuntum Exp $
-#
-
-case "$2" in
- DEINSTALL) cat <<EOF
-
-=============================================================
-Note that namazu configuration (@CONFDIR@/*), index
-files (@INDEXDIR@/*) are not removed in the
-de-installation process. You should remove those by hand,
-if you no longer need them.
-=============================================================
-
-EOF
- ;;
-esac
diff --git a/japanese/namazu1/DESCR b/japanese/namazu1/DESCR
deleted file mode 100644
index a6fceb9c648..00000000000
--- a/japanese/namazu1/DESCR
+++ /dev/null
@@ -1,9 +0,0 @@
-Namazu is a full-text search system intended for easy use. Not only it works
-as a CGI program for a small or medium scale Web search engine, but also works
-as a personal use search system for your pile of email.
-
-(The Japanese word `Namazu' means `catfish' in English.)
-
-Note: Namazu's newer version already exists. Since index file format has
-changed, this pacakge is provided for users who want to continute to use
-existing index files.
diff --git a/japanese/namazu1/INSTALL b/japanese/namazu1/INSTALL
deleted file mode 100644
index b0b37b48fc6..00000000000
--- a/japanese/namazu1/INSTALL
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: INSTALL,v 1.1 2001/10/31 23:29:24 zuntum Exp $
-
-PKGNAME=$1
-STAGE=$2
-
-case ${STAGE} in
-PRE-INSTALL)
- ;;
-POST-INSTALL)
- cat <<EOF
-
-=============================================================
-If you customize namazu configuration, copy
-@DOCDIR@/namazu.conf-dist to
-@CONFDIR@ and edit them.
-=============================================================
-
-EOF
- ;;
-*)
- echo "Unexpected argument: ${STAGE}"
- exit 1
- ;;
-esac
-exit 0
diff --git a/japanese/namazu1/Makefile b/japanese/namazu1/Makefile
deleted file mode 100644
index 22c6b17fb30..00000000000
--- a/japanese/namazu1/Makefile
+++ /dev/null
@@ -1,60 +0,0 @@
-# $NetBSD: Makefile,v 1.8 2001/11/29 01:12:37 hubertf Exp $
-# FreeBSD Id: Makefile,v 1.1.1.1 1999/03/31 11:52:07 flathill Exp $
-
-DISTNAME= namazu-1.3.0.11
-PKGREVISION= 1
-CATEGORIES= japanese textproc
-MASTER_SITES= http://www.namazu.org/stable/
-
-MAINTAINER= tech-pkg-ja@jp.netbsd.org
-HOMEPAGE= http://www.namazu.org/index.html.en
-COMMENT= Namazu is a search engine software intended for easy use
-
-DEPENDS= kakasi>=2.3.1:../../japanese/kakasi
-DEPENDS+= nkf-1.7:../../japanese/nkf
-.if !defined(WITH_CHASEN) || ${WITH_CHASEN} != NO
-DEPENDS+= p5-Text-ChaSen>=1.0:../../japanese/p5-Text-ChaSen
-.endif
-
-CONFIGURE_ARGS+= --with-cgi-dir=${LOCALBASE}/libexec/cgi-bin
-.if defined(WITH_CHASEN) && ${WITH_CHASEN} == NO
-CONFIGURE_ARGS+= -without-chasen
-.else
-CONFIGURE_ARGS+= -with-chasen
-.endif
-
-DEINSTALL_FILE= ${WRKDIR}/DEINSTALL
-INSTALL_FILE= ${WRKDIR}/INSTALL
-
-USE_PERL5= yes
-GNU_CONFIGURE= yes
-
-CONFLICTS+= namazu-[0-9]*
-
-WRKSRC= ${WRKDIR}/${DISTNAME}/src
-CONTRIBDIR= ${WRKDIR}/${DISTNAME}/contrib
-
-CONFDIR= ${LOCALBASE}/etc/namazu
-DOCDIR= ${LOCALBASE}/share/namazu/doc
-INDEXDIR= ${LOCALBASE}/libdata/namazu
-
-post-build:
- @${SED} -e 's|/usr/bin/perl|${LOCALBASE}/bin/perl|g' \
- < ${CONTRIBDIR}/bnamazu > ${WRKDIR}/bnamazu
- @for FILE in \
- ${PKGDIR}/DEINSTALL \
- ${PKGDIR}/INSTALL; \
- do \
- ${SED} -e 's|@CONFDIR@|${CONFDIR}|g' \
- -e 's|@INDEXDIR@|${INDEXDIR}|g' \
- -e 's|@DOCDIR@|${DOCDIR}|g' \
- < $${FILE} > ${WRKDIR}/`basename $${FILE}`; \
- done
-
-post-install:
- @cd ${WRKSRC}; ${MAKE} install_cgi
- @${INSTALL_SCRIPT} ${WRKDIR}/bnamazu ${LOCALBASE}/bin
- @${TEST} -d ${LOCALBASE}/etc/namazu || ${INSTALL_DATA_DIR} ${LOCALBASE}/etc/namazu
- @${SH} ${WRKDIR}/INSTALL ${PKGNAME} POST-INSTALL
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/japanese/namazu1/PLIST b/japanese/namazu1/PLIST
deleted file mode 100644
index 77c1ae735f5..00000000000
--- a/japanese/namazu1/PLIST
+++ /dev/null
@@ -1,44 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/05 22:39:03 skrll Exp $
-bin/bnamazu
-bin/clnmz
-bin/gcnmz
-bin/gtnmz
-bin/mailutime
-bin/mknmz
-bin/namazu
-bin/rvnmz
-bin/vfnmz
-bin/wdnmz
-@exec ${MKDIR} %D/etc/namazu 2>/dev/null || /usr/bin/true
-@dirrm etc/namazu
-@exec ${MKDIR} %D/libdata/namazu 2>/dev/null || /usr/bin/true
-@exec ${MKDIR} %D/libdata/namazu/index 2>/dev/null || /usr/bin/true
-@dirrm libdata/namazu/index
-@dirrm libdata/namazu
-libexec/cgi-bin/namazu.cgi
-share/namazu/doc/COPYING
-share/namazu/doc/ChangeLog
-share/namazu/doc/ToDo
-share/namazu/doc/en/README.en
-share/namazu/doc/en/intro.html
-share/namazu/doc/en/manual.html
-share/namazu/doc/ja/FAQ.html
-share/namazu/doc/ja/README.ja
-share/namazu/doc/ja/history.html
-share/namazu/doc/ja/intro.html
-share/namazu/doc/ja/lynxcgi.html
-share/namazu/doc/ja/manual.html
-share/namazu/doc/ja/nmz_files.txt
-share/namazu/doc/ja/security.html
-share/namazu/doc/namazu.conf-dist
-share/namazu/template/NMZ.body.en
-share/namazu/template/NMZ.body.ja
-share/namazu/template/NMZ.foot.en
-share/namazu/template/NMZ.foot.ja
-share/namazu/template/NMZ.head.en
-share/namazu/template/NMZ.head.ja
-@dirrm share/namazu/template
-@dirrm share/namazu/doc/ja
-@dirrm share/namazu/doc/en
-@dirrm share/namazu/doc
-@dirrm share/namazu
diff --git a/japanese/namazu1/distinfo b/japanese/namazu1/distinfo
deleted file mode 100644
index 697646ceff6..00000000000
--- a/japanese/namazu1/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 10:13:35 wiz Exp $
-
-SHA1 (namazu-1.3.0.11.tar.gz) = 6fca105ad77e1a2940bbfa4e0d74073fd602f411
-Size (namazu-1.3.0.11.tar.gz) = 343632 bytes
-SHA1 (patch-aa) = de27b5877c85c581bfb5b459da96caec1433c7b2
diff --git a/japanese/namazu1/patches/patch-aa b/japanese/namazu1/patches/patch-aa
deleted file mode 100644
index ff616061de2..00000000000
--- a/japanese/namazu1/patches/patch-aa
+++ /dev/null
@@ -1,52 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2001/01/27 02:21:59 taca Exp $
-
---- Makefile.in.orig Wed Jan 26 22:38:51 2000
-+++ Makefile.in
-@@ -21,18 +21,16 @@
-
- BASEDIR = @prefix@
- CGIDIR = @CGIDIR@
--NAMAZUDIR = $(BASEDIR)/namazu
--BINDIR_SYS = $(BASEDIR)/bin # install 'namazu' 'mknmz' command.
--BINDIR = $(NAMAZUDIR)/bin
--INDEXDIR = $(NAMAZUDIR)/index
--DOCDIR = $(NAMAZUDIR)/doc
--LIBDIR = $(NAMAZUDIR)/lib
--CONTRIBDIR = $(NAMAZUDIR)/contrib
-+BINDIR = $(BASEDIR)/bin
-+CONFDIR = $(BASEDIR)/etc/namazu
-+INDEXDIR = $(BASEDIR)/libdata/namazu/index
-+DOCDIR = $(BASEDIR)/share/namazu/doc
-+LIBDIR = $(BASEDIR)/share/namazu/template
-
- ##################################################################
- ## Pathname of namazu.conf
-
--OPT_NAMAZU_CONF = $(LIBDIR)/namazu.conf
-+OPT_NAMAZU_CONF = $(CONFDIR)/namazu.conf
-
- ##################################################################
- ## Programs' pathname
-@@ -307,19 +305,13 @@
- if [ ! -d $(LIBDIR) ]; then \
- mkdir -p $(LIBDIR); \
- fi
-- if [ ! -d $(CONTRIBDIR) ]; then \
-- mkdir -p $(CONTRIBDIR); \
-- fi
-- if [ ! -d $(BINDIR_SYS) ]; then \
-- mkdir -p $(BINDIR_SYS); \
-- fi
- cp mknmz wdnmz rvnmz clnmz namazu vfnmz mailutime gcnmz gtnmz $(BINDIR)
- cp ../COPYING ../ToDo ../ChangeLog $(DOCDIR)
- cp ../README.ja ../doc/ja/* "$(DOCDIR)/ja"
- cp ../README.en ../doc/en/* "$(DOCDIR)/en"
-- cp ../lib/* $(LIBDIR)
-- cp ../contrib/* $(CONTRIBDIR)
-- cp namazu mknmz $(BINDIR_SYS)
-+ rm -f ../lib/*.bak
-+ cp ../lib/NMZ.* $(LIBDIR)
-+ cp ../lib/namazu.conf-dist $(DOCDIR)
-
- clean:
- $(RM) $(TARGET) *.o config.cache config.log config.status
diff --git a/japanese/namazu2/DEINSTALL b/japanese/namazu2/DEINSTALL
deleted file mode 100644
index 701bb4e80a1..00000000000
--- a/japanese/namazu2/DEINSTALL
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: DEINSTALL,v 1.1 2001/10/31 23:29:26 zuntum Exp $
-#
-
-case "$2" in
- DEINSTALL) cat <<EOF
-
-=============================================================
-Note that namazu configuration (@CONFDIR@/*), index
-files (@DATADIR@/*) are not removed in the
-de-installation process. You should remove those by hand,
-if you no longer need them.
-=============================================================
-
-EOF
- ;;
-esac
diff --git a/japanese/namazu2/DESCR b/japanese/namazu2/DESCR
deleted file mode 100644
index 01989bd08be..00000000000
--- a/japanese/namazu2/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Namazu is a full-text search system intended for easy use. Not only it works
-as a CGI program for a small or medium scale Web search engine, but also works
-as a personal use search system for your pile of email.
-
-(The Japanese word `Namazu' means `catfish' in English)
diff --git a/japanese/namazu2/INSTALL b/japanese/namazu2/INSTALL
deleted file mode 100644
index 6036ac1f130..00000000000
--- a/japanese/namazu2/INSTALL
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: INSTALL,v 1.2 2001/12/28 10:32:49 taca Exp $
-
-PKGNAME=$1
-STAGE=$2
-
-case ${STAGE} in
-PRE-INSTALL)
- ;;
-POST-INSTALL)
- cat <<EOF
-
-=============================================================
-1. If you customize namazu configuration, copy
- @EXAMPLEDIR@/share/namazu/namazurc.default and
- @EXAMPLEDIR@/mknmzrc.default to @CONFDIR@,
- and edit them.
-
-2. Since index file format is differnet from namazu 1.X, you need to
- rebuild index files if you upgrade from namazu 1.X.
-
-3. In order to processing Japanese, you need to set "LC_ALL", "LANG"
- or "LC_CTYPE" environment to "ja". Or use --indexing-lang option
- of mknmz.
-
-4. In order to display Japanese message, you need to set "LANGUAGE",
- "LC_ALL", "LC_MESSAGES" or "LANG" environment to "ja".
-
-5. Because of lack of locale support, you need to set "PERL_BADLANG"
- for perl to stop the warning on NetBSD 1.5.X and before.
- On NetBSD current (1.6 or later), you don't need to set
- "PERL_BADLANG" but "LC_LANG" environment.
-
-6. If you want to make index of bellow file type, please install
- appropriate package.
-
- Adobe PDF xpdf
- Adobe PostScript ghostscript
- JustSystem Ichitaro DocCat
- Microsoft Excel xlHtml or DocCat
- Microsoft PowerPoint xlHtml or DocCat
- Microsoft Word wv or DocCat
- Redhat RPM rpm
- TeX source detex
- TeX dvi dvi2tty
-
- For handling non-English language, you might need lv and/or nkf
- package, too.
-
- DocCat is a commercial product from Dehenken Limited and it dosen't
- provided as NetBSD package (yet?).
- See http://www.dehenken.co.jp/english/doccat.html in detail.
-
-=============================================================
-
-EOF
- ;;
-*)
- echo "Unexpected argument: ${STAGE}"
- exit 1
- ;;
-esac
-exit 0
diff --git a/japanese/namazu2/Makefile b/japanese/namazu2/Makefile
deleted file mode 100644
index 142c15471cd..00000000000
--- a/japanese/namazu2/Makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-# $NetBSD: Makefile,v 1.13 2002/01/10 17:54:31 taca Exp $
-# FreeBSD Id: ports/japanese/namazu2/Makefile,v 1.16 2000/10/26 20:56:25 knu Exp
-
-DISTNAME= namazu-2.0.10
-PKGREVISION= 2
-CATEGORIES= japanese textproc www
-MASTER_SITES= ftp://ftp.namazu.org/namazu/stable/ \
- http://www.namazu.org/stable/
-
-MAINTAINER= packages@netbsd.org
-HOMEPAGE= http://www.namazu.org/index.html.en
-COMMENT= Full-text search system intended for easy use
-
-DEPENDS+= p5-File-MMagic>=1.09:../../misc/p5-File-MMagic
-DEPENDS+= p5-Text-Kakasi>=1.04:../../japanese/p5-Text-Kakasi
-DEPENDS+= p5-nkf>=1.7:../../japanese/p5-nkf
-.if !defined(WITH_CHASEN) || ${WITH_CHASEN} != NO
-DEPENDS+= p5-Text-ChaSen>=1.0:../../japanese/p5-Text-ChaSen
-.endif
-
-CONFIGURE_ARGS+= --localstatedir=${LOCALBASE}/libdata \
- --libexecdir=${LOCALBASE}/libexec/cgi-bin
-.if defined(WITH_CHASEN) && ${WITH_CHASEN} == NO
-CONFIGURE_ARGS+= -without-chasen
-.else
-CONFIGURE_ARGS+= -with-chasen
-.endif
-
-DEINSTALL_FILE= ${WRKDIR}/DEINSTALL
-INSTALL_FILE= ${WRKDIR}/INSTALL
-
-USE_BUILDLINK_ONLY= # defined
-USE_PERL5= # defined
-GNU_CONFIGURE= # defined
-USE_LIBTOOL= # defined
-LTCONFIG_OVERRIDE=${WRKSRC}/ltconfig
-
-CONFLICTS+= namazu-[0-9]*
-
-post-build:
- @for FILE in \
- ${PKGDIR}/DEINSTALL \
- ${PKGDIR}/INSTALL; \
- do \
- ${SED} -e 's|@CONFDIR@|${LOCALBASE}/etc/namazu|g' \
- -e 's|@DATADIR@|${LOCALBASE}/libdata/namazu|g' \
- -e 's|@EXAMPLEDIR@|${LOCALBASE}/share/namazu|g' \
- < $${FILE} > ${WRKDIR}/`basename $${FILE}`; \
- done
-
-post-install:
- @${TEST} -d ${LOCALBASE}/etc/namazu || ${INSTALL_DATA_DIR} ${LOCALBASE}/etc/namazu
- @${SH} ${WRKDIR}/INSTALL ${PKGNAME} POST-INSTALL
-
-test:
- @cd ${WRKSRC}; make check
-
-.include "../../devel/gettext-lib/buildlink.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/japanese/namazu2/PLIST b/japanese/namazu2/PLIST
deleted file mode 100644
index 38e4af0530c..00000000000
--- a/japanese/namazu2/PLIST
+++ /dev/null
@@ -1,139 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2002/02/05 22:39:03 skrll Exp $
-bin/adnmz
-bin/bnamazu
-bin/gcnmz
-bin/kwnmz
-bin/lnnmz
-bin/mailutime
-bin/mknmz
-bin/namazu
-bin/nmz-config
-bin/nmzgrep
-bin/nmzmerge
-bin/rfnmz
-bin/vfnmz
-@exec ${MKDIR} %D/etc/namazu 2>/dev/null|| /usr/bin/true
-@dirrm etc/namazu
-include/namazu/codeconv.h
-include/namazu/field.h
-include/namazu/hlist.h
-include/namazu/i18n.h
-include/namazu/idxname.h
-include/namazu/l10n-ja.h
-include/namazu/libnamazu.h
-include/namazu/parser.h
-include/namazu/query.h
-include/namazu/re.h
-include/namazu/regex.h
-include/namazu/score.h
-include/namazu/search.h
-include/namazu/util.h
-include/namazu/var.h
-include/namazu/wakati.h
-@dirrm include/namazu
-lib/libnmz.a
-lib/libnmz.la
-lib/libnmz.so
-lib/libnmz.so.5
-lib/libnmz.so.5.0
-@exec ${MKDIR} %D/libdata/namazu 2>/dev/null|| /usr/bin/true
-@exec ${MKDIR} %D/libdata/namazu/index 2>/dev/null || /usr/bin/true
-@dirrm libdata/namazu/index
-@dirrm libdata/namazu
-libexec/cgi-bin/namazu.cgi
-man/man1/mknmz.1
-man/man1/namazu.1
-share/locale/es/LC_MESSAGES/namazu.mo
-share/locale/fr/LC_MESSAGES/namazu.mo
-share/locale/ja/LC_MESSAGES/namazu.mo
-share/locale/ja_JP.SJIS/LC_MESSAGES/namazu.mo
-share/namazu/doc/en/manual.html
-share/namazu/doc/en/nmz.html
-share/namazu/doc/en/tips.html
-share/namazu/doc/en/tutorial.html
-@dirrm share/namazu/doc/en
-share/namazu/doc/ja/manual.html
-share/namazu/doc/ja/nmz.html
-share/namazu/doc/ja/tips.html
-share/namazu/doc/ja/tutorial.html
-@dirrm share/namazu/doc/ja
-share/namazu/doc/namazu.css
-@dirrm share/namazu/doc
-share/namazu/etc/AUTHORS
-share/namazu/etc/CREDITS
-share/namazu/etc/COPYING
-share/namazu/etc/ChangeLog
-share/namazu/etc/ChangeLog.1
-share/namazu/etc/HACKING
-share/namazu/etc/HACKING-ja
-share/namazu/etc/INSTALL
-share/namazu/etc/INSTALL-ja
-share/namazu/etc/NEWS
-share/namazu/etc/README
-share/namazu/etc/README-es
-share/namazu/etc/README-ja
-share/namazu/etc/THANKS
-share/namazu/etc/TODO
-share/namazu/etc/namazu.png
-@dirrm share/namazu/etc
-share/namazu/filter/bzip2.pl
-share/namazu/filter/compress.pl
-share/namazu/filter/deb.pl
-share/namazu/filter/dvi.pl
-share/namazu/filter/excel.pl
-share/namazu/filter/gzip.pl
-share/namazu/filter/hdml.pl
-share/namazu/filter/hnf.pl
-share/namazu/filter/html.pl
-share/namazu/filter/mailnews.pl
-share/namazu/filter/man.pl
-share/namazu/filter/mhonarc.pl
-share/namazu/filter/msword.pl
-share/namazu/filter/pdf.pl
-share/namazu/filter/postscript.pl
-share/namazu/filter/powerpoint.pl
-share/namazu/filter/rfc.pl
-share/namazu/filter/rpm.pl
-share/namazu/filter/taro.pl
-share/namazu/filter/tex.pl
-@dirrm share/namazu/filter
-share/namazu/mknmzrc.example
-share/namazu/namazurc.example
-share/namazu/pl/codeconv.pl
-share/namazu/pl/conf.pl
-share/namazu/pl/gettext.pl
-share/namazu/pl/gfilter.pl
-share/namazu/pl/htmlsplit.pl
-share/namazu/pl/nmzidx.pl
-share/namazu/pl/seed.pl
-share/namazu/pl/usage.pl
-share/namazu/pl/util.pl
-share/namazu/pl/var.pl
-share/namazu/pl/wakati.pl
-@dirrm share/namazu/pl
-share/namazu/template/NMZ.body
-share/namazu/template/NMZ.body.es
-share/namazu/template/NMZ.body.fr
-share/namazu/template/NMZ.body.ja
-share/namazu/template/NMZ.foot
-share/namazu/template/NMZ.foot.es
-share/namazu/template/NMZ.foot.fr
-share/namazu/template/NMZ.foot.ja
-share/namazu/template/NMZ.head
-share/namazu/template/NMZ.head.es
-share/namazu/template/NMZ.head.fr
-share/namazu/template/NMZ.head.ja
-share/namazu/template/NMZ.result.normal
-share/namazu/template/NMZ.result.normal.es
-share/namazu/template/NMZ.result.normal.fr
-share/namazu/template/NMZ.result.normal.ja
-share/namazu/template/NMZ.result.short
-share/namazu/template/NMZ.result.short.es
-share/namazu/template/NMZ.result.short.fr
-share/namazu/template/NMZ.result.short.ja
-share/namazu/template/NMZ.tips
-share/namazu/template/NMZ.tips.es
-share/namazu/template/NMZ.tips.fr
-share/namazu/template/NMZ.tips.ja
-@dirrm share/namazu/template
-@dirrm share/namazu
diff --git a/japanese/namazu2/distinfo b/japanese/namazu2/distinfo
deleted file mode 100644
index 456281e8c09..00000000000
--- a/japanese/namazu2/distinfo
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: distinfo,v 1.10 2002/01/10 17:54:31 taca Exp $
-
-SHA1 (namazu-2.0.10.tar.gz) = 43a7f32ff0d86b4e65dfa9fa6c1ad90a0636a8a8
-Size (namazu-2.0.10.tar.gz) = 833838 bytes
-SHA1 (patch-aa) = 336a7f68842d4a9ca29ce085ccded45fe0b1392f
-SHA1 (patch-ab) = c5baa6b5555c4fee0215980ca8df3880fa93390f
-SHA1 (patch-af) = a5a4c913980e163813f06749445c980eb4644737
-SHA1 (patch-ag) = 626af603170bca527cedc4d27e07e1c07259a701
-SHA1 (patch-ah) = e38d7efb8e1e8a6e80e96fe84f9c180ec8a7fbb4
-SHA1 (patch-ai) = 49d685ddd93207f984813e05a21da60fe1862bef
-SHA1 (patch-al) = f05436ec713ae1bcb01dd7b1a9a7a598018e9dd7
-SHA1 (patch-am) = abce3739aa99e9ee19bf4b56f961c33cc33004be
-SHA1 (patch-an) = fa073b9baef46cd31348d048816f8592a8b35f20
-SHA1 (patch-ao) = 16070a6b7f9b50e2e14d3256d6bab44c9ea52aca
diff --git a/japanese/namazu2/patches/patch-aa b/japanese/namazu2/patches/patch-aa
deleted file mode 100644
index c8d1e6f7d24..00000000000
--- a/japanese/namazu2/patches/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/01/27 02:29:25 taca Exp $
-
---- conf/Makefile.am.orig Fri Feb 25 23:04:36 2000
-+++ conf/Makefile.am
-@@ -1,9 +1,12 @@
- AUTOMAKE_OPTIONS = 1.4 no-dependencies
-
--confdir = $(sysconfdir)/$(PACKAGE)
--conf_DATA = namazurc-sample mknmzrc-sample
-+confdir = $(pkgdatadir)
-+conf_DATA = namazurc.example mknmzrc.example
- EXTRA_DIST = namazurc-sample
--CLEANFILES = mknmzrc-sample
-+CLEANFILES = namazurc.example mknmzrc.example
-
--mknmzrc-sample: ../pl/conf.pl
-+namazurc.example: namazurc-sample
-+ @cp -p $? $@
-+
-+mknmzrc.example: ../pl/conf.pl
- perl -pe 's/^/\x23 / unless /^(\x23|package|$$)/' ../pl/conf.pl > $@
diff --git a/japanese/namazu2/patches/patch-ab b/japanese/namazu2/patches/patch-ab
deleted file mode 100644
index 263c40e30c7..00000000000
--- a/japanese/namazu2/patches/patch-ab
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2001/12/28 10:32:50 taca Exp $
-
---- conf/Makefile.in.orig Thu Dec 27 14:06:04 2001
-+++ conf/Makefile.in
-@@ -117,10 +117,10 @@
-
- AUTOMAKE_OPTIONS = 1.4 no-dependencies
-
--confdir = $(sysconfdir)/$(PACKAGE)
--conf_DATA = namazurc-sample mknmzrc-sample
-+confdir = $(pkgdatadir)
-+conf_DATA = namazurc.example mknmzrc.example
- EXTRA_DIST = namazurc-sample
--CLEANFILES = mknmzrc-sample
-+CLEANFILES = namazurc.example mknmzrc.example
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
- CONFIG_CLEAN_FILES =
-@@ -244,7 +244,10 @@
- maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
--mknmzrc-sample: ../pl/conf.pl
-+namazurc.example: namazurc-sample
-+ @cp -p $? $@
-+
-+mknmzrc.example: ../pl/conf.pl
- perl -pe 's/^/\x23 / unless /^(\x23|package|$$)/' ../pl/conf.pl > $@
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/japanese/namazu2/patches/patch-af b/japanese/namazu2/patches/patch-af
deleted file mode 100644
index 228f2a61890..00000000000
--- a/japanese/namazu2/patches/patch-af
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-af,v 1.1 2001/09/24 03:56:02 taca Exp $
-
---- lib/getopt.c.orig Mon Oct 11 13:25:11 1999
-+++ lib/getopt.c
-@@ -71,10 +71,11 @@
-
- #ifdef VMS
- #include <unixlib.h>
-+#endif
-+
- #if HAVE_STRING_H - 0
- #include <string.h>
- #endif
--#endif
-
- #if defined (WIN32) && !defined (__CYGWIN32__)
- /* It's not Unix, really. See? Capital letters. */
-@@ -695,7 +696,7 @@
- optarg = nameend + 1;
- else
- {
-- if (opterr)
-+ if (opterr) {
- if (argv[optind - 1][1] == '-')
- /* --option */
- fprintf (stderr,
-@@ -706,6 +707,7 @@
- fprintf (stderr,
- _("%s: option `%c%s' doesn't allow an argument\n"),
- argv[0], argv[optind - 1][0], pfound->name);
-+ }
-
- nextchar += strlen (nextchar);
-
diff --git a/japanese/namazu2/patches/patch-ag b/japanese/namazu2/patches/patch-ag
deleted file mode 100644
index 4ee964160f5..00000000000
--- a/japanese/namazu2/patches/patch-ag
+++ /dev/null
@@ -1,183 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2001/09/24 03:56:02 taca Exp $
-
---- nmz/regex.c.orig Sat Sep 1 18:40:52 2001
-+++ nmz/regex.c
-@@ -71,6 +71,12 @@
- void free _((void*));
- #endif
-
-+#ifdef HAVE_STRING_H
-+# include <string.h>
-+#else
-+# include <strings.h>
-+#endif
-+
- /* #define NO_ALLOCA */ /* try it out for now */
- #ifndef NO_ALLOCA
- /* Make alloca work the best possible way. */
-@@ -99,12 +105,6 @@
- # endif
- #endif /* __GNUC__ */
-
--#ifdef HAVE_STRING_H
--# include <string.h>
--#else
--# include <strings.h>
--#endif
--
- #define RE_ALLOCATE alloca
- #ifdef C_ALLOCA
- #define FREE_VARIABLES() alloca(0)
-@@ -153,7 +153,9 @@
- static void insert_jump _((int, char*, char*, char*));
- static void store_jump_n _((char*, int, char*, unsigned));
- static void insert_jump_n _((int, char*, char*, char*, unsigned));
-+#if 0
- static void insert_op _((int, char*, char*));
-+#endif
- static void insert_op_2 _((int, char*, char*, int, int));
- static int memcmp_translate _((unsigned char*, unsigned char*, int));
-
-@@ -175,9 +177,7 @@
-
- #undef P
-
--#ifdef RUBY
- #include "util.h"
--#endif
-
- static void
- init_syntax_once()
-@@ -358,7 +358,7 @@
- wordbeg, /* Succeeds if at word beginning. */
- wordend, /* Succeeds if at word end. */
- wordbound, /* Succeeds if at a word boundary. */
-- notwordbound,/* Succeeds if not at a word boundary. */
-+ notwordbound /* Succeeds if not at a word boundary. */
- };
-
-
-@@ -409,6 +409,7 @@
- long syntax;
- {
- /* obsolete */
-+ return 0;
- }
-
-
-@@ -442,7 +443,7 @@
- int n = mbclen(c) - 1; \
- c &= (1<<(BYTEWIDTH-2-n)) - 1; \
- while (n--) { \
-- c = c << 6 | *p++ & ((1<<6)-1); \
-+ c = (c << 6) | (*p++ & ((1<<6)-1)); \
- } \
- } \
- else { \
-@@ -483,23 +484,28 @@
- {
- if (current_mbctype == MBCTYPE_UTF8) {
- if (c < 0x80)
-- printf("%c", c);
-+ printf("%c", (int)c);
- else if (c <= 0x7ff)
-- printf("%c%c", utf8_firstbyte(c), c&0x3f);
-+ printf("%c%c", (int)utf8_firstbyte(c), (int)(c & 0x3f));
- else if (c <= 0xffff)
-- printf("%c%c%c", utf8_firstbyte(c), (c>>6)&0x3f, c&0x3f);
-+ printf("%c%c%c", (int)utf8_firstbyte(c), (int)((c >> 6) & 0x3f),
-+ (int)(c & 0x3f));
- else if (c <= 0x1fffff)
-- printf("%c%c%c%c", utf8_firstbyte(c), (c>>12)&0x3f, (c>>6)&0x3f, c&0x3f);
-+ printf("%c%c%c%c", (int)utf8_firstbyte(c), (int)((c >> 12) & 0x3f),
-+ (int)((c >> 6) & 0x3f), (int)(c & 0x3f));
- else if (c <= 0x3ffffff)
-- printf("%c%c%c%c%c", utf8_firstbyte(c), (c>>18)&0x3f, (c>>12)&0x3f, (c>>6)&0x3f, c&0x3f);
-+ printf("%c%c%c%c%c", (int)utf8_firstbyte(c), (int)((c >> 18) & 0x3f),
-+ (int)((c >> 12) & 0x3f), (int)((c >> 6) & 0x3f), (int)(c & 0x3f));
- else if (c <= 0x7fffffff)
-- printf("%c%c%c%c%c%c", utf8_firstbyte(c), (c>>24)&0x3f, (c>>18)&0x3f, (c>>12)&0x3f, (c>>6)&0x3f, c&0x3f);
-+ printf("%c%c%c%c%c%c", (int)utf8_firstbyte(c), (int)((c >> 24) & 0x3f),
-+ (int)((c >> 18) & 0x3f), (int)((c >> 12) & 0x3f),
-+ (int)((c >> 6) & 0x3f), (int)(c & 0x3f));
- }
- else if (c < 0xff) {
-- printf("\\%o", c);
-+ printf("\\%o", (int)c);
- }
- else {
-- printf("%c%c", c>>BYTEWIDTH, c&0xff);
-+ printf("%c%c", (int)(c >> BYTEWIDTH), (int)(c &0xff));
- }
- }
-
-@@ -700,6 +706,7 @@
- return 0;
- }
-
-+#if 0
- static void
- print_partial_compiled_pattern(start, end)
- unsigned char *start;
-@@ -949,6 +956,7 @@
-
- print_partial_compiled_pattern (buffer, buffer + bufp->used);
- }
-+#endif
-
- static char*
- calculate_must_string(start, end)
-@@ -1118,7 +1126,7 @@
- register const char *p = pattern;
- const char *nextp;
- const char *pend = pattern + size;
-- register unsigned int c, c1;
-+ register unsigned int c, c1 = 0;
- const char *p0;
- int numlen;
-
-@@ -1412,8 +1420,8 @@
- case 'W':
- for (c = 0; c < (1 << BYTEWIDTH); c++) {
- if (SYNTAX(c) != Sword &&
-- (current_mbctype && !re_mbctab[c] ||
-- !current_mbctype && SYNTAX(c) != Sword2))
-+ ((current_mbctype && !re_mbctab[c]) ||
-+ (!current_mbctype && SYNTAX(c) != Sword2)))
- SET_LIST_BIT(c);
- }
- last = -1;
-@@ -2241,6 +2249,8 @@
- case dummy_failure_jump:
- bufp->options |= RE_OPTIMIZE_ANCHOR;
- break;
-+ default:
-+ break;
- }
- }
- else if (*laststart == charset || *laststart == charset_not) {
-@@ -2409,6 +2419,7 @@
- }
-
-
-+#if 0
- /* Open up space at location THERE, and insert operation OP.
- CURRENT_END gives the end of the storage in use, so
- we know how much data to copy up.
-@@ -2428,7 +2439,7 @@
-
- there[0] = (char)op;
- }
--
-+#endif
-
- /* Open up space at location THERE, and insert operation OP followed by
- NUM_1 and NUM_2. CURRENT_END gives the end of the storage in use, so
-@@ -4095,7 +4106,6 @@
- p1 = p;
- /* If failed to a backwards jump that's part of a repetition
- loop, need to pop this failure point and use the next one. */
-- pop_loop:
- switch ((enum regexpcode)*p1) {
- case jump_n:
- case finalize_push_n:
diff --git a/japanese/namazu2/patches/patch-ah b/japanese/namazu2/patches/patch-ah
deleted file mode 100644
index 3fadb7210b1..00000000000
--- a/japanese/namazu2/patches/patch-ah
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2001/09/24 03:56:02 taca Exp $
-
---- nmz/util.c.orig Sun Sep 2 16:13:37 2001
-+++ nmz/util.c
-@@ -102,9 +102,9 @@
- */
-
- unsigned long
--nmz_scan_oct(char *start, int len, int *retlen)
-+nmz_scan_oct(const char *start, int len, int *retlen)
- {
-- register char *s = start;
-+ register const char *s = start;
- register unsigned long retval = 0;
-
- while (len-- && *s >= '0' && *s <= '7') {
-@@ -117,10 +117,10 @@
- }
-
- unsigned long
--nmz_scan_hex(char *start, int len, int *retlen)
-+nmz_scan_hex(const char *start, int len, int *retlen)
- {
- static char hexdigit[] = "0123456789abcdef0123456789ABCDEFx";
-- register char *s = start;
-+ register const char *s = start;
- register unsigned long retval = 0;
- char *tmp;
-
diff --git a/japanese/namazu2/patches/patch-ai b/japanese/namazu2/patches/patch-ai
deleted file mode 100644
index e3c3a5eb6f4..00000000000
--- a/japanese/namazu2/patches/patch-ai
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2001/09/24 03:56:02 taca Exp $
-
---- nmz/util.h.orig Mon Jul 9 16:30:37 2001
-+++ nmz/util.h
-@@ -14,8 +14,8 @@
- #define nmz_iseuc_kana1st(c) ((uchar)(c) == 0x8e)
- #define nmz_iseuc_hojo1st(c) ((uchar)(c) == 0x8f)
-
--extern unsigned long nmz_scan_oct ( char *start, int len, int *retlen );
--extern unsigned long nmz_scan_hex ( char *start, int len, int *retlen );
-+extern unsigned long nmz_scan_oct (const char *start, int len, int *retlen );
-+extern unsigned long nmz_scan_hex (const char *start, int len, int *retlen );
- extern void * nmz_xmalloc ( unsigned long size );
- extern void * nmz_xrealloc ( void *ptr, unsigned long size );
- extern void nmz_tr ( char *str, const char *lstr, const char *rstr );
diff --git a/japanese/namazu2/patches/patch-al b/japanese/namazu2/patches/patch-al
deleted file mode 100644
index 9db6d7aff09..00000000000
--- a/japanese/namazu2/patches/patch-al
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-al,v 1.2 2001/12/28 10:32:50 taca Exp $
-
---- scripts/mknmz.in.orig Sun Nov 25 18:28:58 2001
-+++ scripts/mknmz.in
-@@ -176,6 +176,8 @@
- my $processed_num = 0;
- my $file_size = util::filesize($cfile);
-
-+ return ($file_size, $processed_num) unless $file_size;
-+
- if ($var::Opt{'htmlsplit'} && $cfile =~ $conf::HTML_SUFFIX) {
- my @parts = htmlsplit::split($cfile, "NMZ.partial");
- if (@parts > 1) {
diff --git a/japanese/namazu2/patches/patch-am b/japanese/namazu2/patches/patch-am
deleted file mode 100644
index 2d3f44d4dbd..00000000000
--- a/japanese/namazu2/patches/patch-am
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-am,v 1.3 2002/01/10 17:54:32 taca Exp $
-
---- filter/excel.pl.orig Fri Dec 15 14:37:41 2000
-+++ filter/excel.pl
-@@ -26,6 +26,7 @@
-
- package excel;
- use strict;
-+use File::Basename;
- use File::Copy;
- require 'util.pl';
- require 'gfilter.pl';
-@@ -33,15 +34,17 @@
-
- my $xlconvpath = undef;
- my $utfconvpath = undef;
-+my $convname = undef;
-
- sub mediatype() {
- return ('application/excel');
- }
-
- sub status() {
-- $xlconvpath = util::checkcmd('xlHtml');
-+ $xlconvpath = util::checkcmd('xlhtml') || util::checkcmd('xlHtml');
- # return 'no' unless defined $xlconvpath;
- if (defined $xlconvpath) {
-+ $convname = basename($xlconvpath);
- if (!util::islang("ja")) {
- return 'yes';
- } else {
-@@ -83,7 +86,7 @@
- = @_;
- my $err = undef;
-
-- if (util::checkcmd('xlHtml')) {
-+ if ($convname =~ /xlhtml/i) {
- $err = filter_xl($orig_cfile, $cont, $weighted_str, $headings, $fields);
- } else {
- $err = filter_doccat($orig_cfile, $cont, $weighted_str, $headings, $fields);
diff --git a/japanese/namazu2/patches/patch-an b/japanese/namazu2/patches/patch-an
deleted file mode 100644
index 37e1e1f5aef..00000000000
--- a/japanese/namazu2/patches/patch-an
+++ /dev/null
@@ -1,69 +0,0 @@
-$NetBSD: patch-an,v 1.1 2001/12/28 10:32:50 taca Exp $
-
---- filter/msword.pl.orig Fri Jul 13 10:14:26 2001
-+++ filter/msword.pl
-@@ -25,6 +25,7 @@
-
- package msword;
- use strict;
-+use File::Basename;
- use File::Copy;
- require 'util.pl';
- require 'gfilter.pl';
-@@ -33,6 +34,7 @@
- my $wordconvpath = undef;
- my $utfconvpath = undef;
- my $wvversionpath = undef;
-+my $wordconvname = undef;
-
- sub mediatype() {
- return ('application/msword');
-@@ -80,7 +82,10 @@
- = @_;
- my $err = undef;
-
-- if (util::checkcmd('wvHtml')) {
-+ if (not defined $wordconvname) {
-+ $wordconvname = basename($wordconvpath);
-+ }
-+ if ($wordconvname =~ /wvhtml/i) {
- $err = filter_wv($orig_cfile, $cont, $weighted_str, $headings, $fields);
- } else {
- $err = filter_doccat($orig_cfile, $cont, $weighted_str, $headings, $fields);
-@@ -95,7 +100,7 @@
-
- my $tmpfile = util::tmpnam('NMZ.word');
- my $tmpfile2 = util::tmpnam('NMZ.word2');
--
-+ my ($ofile, $tpath, $options, $version);
-
- if (util::islang("ja")) {
- }
-@@ -107,8 +112,17 @@
- print $fh $$cont;
- }
-
-+ $version = `$wordconvpath --version 2>/dev/null`;
-+ chomp $version;
-+ if ($version ne "" and $version !~ /usage/i and $version ge "0.7") {
-+ ($ofile, $tpath) = fileparse($tmpfile2);
-+ $options = "--targetdir=$tpath";
-+ } else {
-+ $ofile = $tmpfile2;
-+ }
-+
- if (!util::islang("ja")) {
-- system("$wordconvpath $tmpfile $tmpfile2");
-+ system("$wordconvpath $options $tmpfile $ofile");
- } else {
- my $version = "unknown";
- my $supported = undef;
-@@ -125,7 +139,7 @@
- }
- }
- return _("Unsupported format: ") . $version unless $supported;
-- system("$wordconvpath $tmpfile $tmpfile2");
-+ system("$wordconvpath $options $tmpfile $ofile");
- system("$utfconvpath -Iu8 -Oej $tmpfile2 > $tmpfile");
- unlink($tmpfile2);
- rename($tmpfile, $tmpfile2);
diff --git a/japanese/namazu2/patches/patch-ao b/japanese/namazu2/patches/patch-ao
deleted file mode 100644
index d1240a95ac7..00000000000
--- a/japanese/namazu2/patches/patch-ao
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-ao,v 1.3 2002/01/10 17:54:32 taca Exp $
-
---- filter/powerpoint.pl.orig Tue Dec 26 13:59:01 2000
-+++ filter/powerpoint.pl
-@@ -25,6 +25,7 @@
-
- package powerpoint;
- use strict;
-+use File::Basename;
- use File::Copy;
- require 'util.pl';
- require 'gfilter.pl';
-@@ -32,15 +33,17 @@
-
- my $pptconvpath = undef;
- my $utfconvpath = undef;
-+my $pptconvname = undef;
-
- sub mediatype() {
- return ('application/powerpoint');
- }
-
- sub status() {
-- $pptconvpath = util::checkcmd('pptHtml');
-+ $pptconvpath = util::checkcmd('ppthtml') || util::checkcmd('pptHtml');
- # return 'no' unless defined $pptconvpath
- if (defined $pptconvpath) {
-+ $pptconvname = basename($pptconvpath);
- if (!util::islang("ja")) {
- return 'yes';
- } else {
-@@ -82,7 +85,7 @@
- = @_;
- my $err = undef;
-
-- if (util::checkcmd('pptHtml')) {
-+ if ($pptconvname =~ /ppthtml/i) {
- $err = filter_ppt($orig_cfile, $cont, $weighted_str, $headings, $fields);
- } else {
- $err = filter_doccat($orig_cfile, $cont, $weighted_str, $headings, $fields);
diff --git a/japanese/nkf/DESCR b/japanese/nkf/DESCR
deleted file mode 100644
index 3eb4a732c22..00000000000
--- a/japanese/nkf/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-Nkf is a yet another kanji code converter between the different types
-of kanji codes out there. It can convert between 7-bit JIS, MS-kanji
-(shifted-JIS) or EUC.
-
-One of the most unique facilities of nkf is that it guesses the input
-kanji code. It currently recognizes 7-bit JIS, MS-kanji (shifted-JIS)
-and EUC. So users don't need to specify (or even know) the input
-kanji code type.
diff --git a/japanese/nkf/Makefile b/japanese/nkf/Makefile
deleted file mode 100644
index a705506de98..00000000000
--- a/japanese/nkf/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2002/04/03 02:55:24 itojun Exp $
-
-DISTNAME= nkf-1.7
-CATEGORIES= japanese converters
-MASTER_SITES= ftp://ftp.sra.co.jp/pub/cmd/nkf/
-
-PATCH_SITES= http://www.rs.civil.tohoku.ac.jp/~ito/ws/
-PATCHFILES= nkf.patch.txt
-
-MAINTAINER= kay@kaynet.or.jp
-COMMENT= Network Kanji code conversion Filter
-
-ALL_TARGET= nkf
-PATCH_DIST_ARGS+= -R -d ${WRKSRC}
-
-post-extract:
- @cd ${WRKSRC} && ${PATCH} ${PATCH_ARGS} < ${FILESDIR}/nkf.post-extract
- @${RM} -rf ${WRKSRC}/NKF
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/nkf ${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/nkf.1 ${PREFIX}/man/man1
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/japanese/nkf/PLIST b/japanese/nkf/PLIST
deleted file mode 100644
index 5145d29473a..00000000000
--- a/japanese/nkf/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:29:28 zuntum Exp $
-bin/nkf
-man/man1/nkf.1
diff --git a/japanese/nkf/distinfo b/japanese/nkf/distinfo
deleted file mode 100644
index 8a42a1abe93..00000000000
--- a/japanese/nkf/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 10:13:35 wiz Exp $
-
-SHA1 (nkf-1.7.tar.gz) = 2116864c1acc8e6f80d4c59dc63c73eb37c9e80c
-Size (nkf-1.7.tar.gz) = 28222 bytes
-SHA1 (nkf.patch.txt) = f7b0a640be331a707584ba34d083f5e2361c3969
-Size (nkf.patch.txt) = 3558 bytes
diff --git a/japanese/nkf/files/nkf.post-extract b/japanese/nkf/files/nkf.post-extract
deleted file mode 100644
index 61df30147cb..00000000000
--- a/japanese/nkf/files/nkf.post-extract
+++ /dev/null
@@ -1,19 +0,0 @@
-*** nkf.c.bak Sun May 9 17:20:37 1999
---- nkf.c Sun May 9 17:21:32 1999
-***************
-*** 1483,1489 ****
-
-
- #ifdef STRICT_MIME
-! /* This converts ^\^\*/
-
- unsigned char *mime_pattern[] = {
- (unsigned char *)"\075?ISO-8859-1?Q?",
---- 1483,1489 ----
-
-
- #ifdef STRICT_MIME
-! /* This converts */
-
- unsigned char *mime_pattern[] = {
- (unsigned char *)"\075?ISO-8859-1?Q?",
diff --git a/japanese/p5-Jcode/DESCR b/japanese/p5-Jcode/DESCR
deleted file mode 100644
index e4cf1cc3ccc..00000000000
--- a/japanese/p5-Jcode/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-Jcode.pm is a Perl module that handles various Japanese charsets.
-It has all features available on jcode.pl-2.10 PLUS
-
- *Object-oriented approach on Japanese text handling
- *mime header handling
- *Unicode feature (UCS2 and UTF8)
-
-Detail: http://openlab.ring.gr.jp/Jcode/Jcode.html
diff --git a/japanese/p5-Jcode/Makefile b/japanese/p5-Jcode/Makefile
deleted file mode 100644
index e22d7af83e9..00000000000
--- a/japanese/p5-Jcode/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# $NetBSD: Makefile,v 1.16 2002/05/03 13:44:47 taca Exp $
-#
-
-DISTNAME= Jcode-0.80
-PKGNAME= p5-${DISTNAME}
-SVR4_PKGNAME= p5jco
-CATEGORIES= converters japanese
-MASTER_SITES= http://openlab.ring.gr.jp/Jcode/
-
-MAINTAINER= tech-pkg-ja@jp.netbsd.org
-HOMEPAGE= http://openlab.ring.gr.jp/Jcode/index.html
-COMMENT= perl5 module for handling various Japanese charsets
-
-DEPENDS+= p5-MIME-Base64>=2.1:../../converters/p5-MIME-Base64
-
-USE_BUILDLINK_ONLY= YES
-PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Jcode/.packlist
-
-pre-configure:
- @cd ${WRKSRC}; ${RM} -f mac_install.pl win_install.pl
-
-do-configure:
- @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
-test:
- @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} test
-
-.include "../../lang/perl5/buildlink.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/japanese/p5-Jcode/PLIST b/japanese/p5-Jcode/PLIST
deleted file mode 100644
index 2a7c80d7901..00000000000
--- a/japanese/p5-Jcode/PLIST
+++ /dev/null
@@ -1 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:29:29 zuntum Exp $
diff --git a/japanese/p5-Jcode/distinfo b/japanese/p5-Jcode/distinfo
deleted file mode 100644
index 698e7599289..00000000000
--- a/japanese/p5-Jcode/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.12 2002/05/03 13:44:47 taca Exp $
-
-SHA1 (Jcode-0.80.tar.gz) = 9f7bb8c007e1cb64c77d9c85e9f6e893089e98cf
-Size (Jcode-0.80.tar.gz) = 187438 bytes
-SHA1 (patch-aa) = 27a8d2a53abdf6ca77444a671e8ad319a2e973d1
diff --git a/japanese/p5-Jcode/patches/patch-aa b/japanese/p5-Jcode/patches/patch-aa
deleted file mode 100644
index 2076698b7dd..00000000000
--- a/japanese/p5-Jcode/patches/patch-aa
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2002/05/03 13:44:47 taca Exp $
-
---- MANIFEST.orig Fri May 3 09:01:24 2002
-+++ MANIFEST
-@@ -15,7 +15,6 @@
- Unicode/_test.pl
- Unicode/table.h
- Unicode/uni.c
--mac_install.pl
- t/ambiguous.pl
- t/benchmark.pl
- t/convert.t
-@@ -32,4 +31,3 @@
- t/unibench.pl
- t/x0212.euc
- t/zenkaku.euc
--win_install.pl
diff --git a/japanese/p5-Text-ChaSen/DESCR b/japanese/p5-Text-ChaSen/DESCR
deleted file mode 100644
index b204613f229..00000000000
--- a/japanese/p5-Text-ChaSen/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Text::ChaSen - ChaSen library module for perl.
-
-This is a module to use ChaSen, Japanese Morphological
-Analysis System, developed by Nara Institute of Science
-and Technorogy, from perl.
diff --git a/japanese/p5-Text-ChaSen/Makefile b/japanese/p5-Text-ChaSen/Makefile
deleted file mode 100644
index 32fb73924fc..00000000000
--- a/japanese/p5-Text-ChaSen/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: Makefile,v 1.8 2001/11/29 01:12:38 hubertf Exp $
-
-DISTNAME= Text-ChaSen-1.03
-PKGNAME= p5-${DISTNAME}
-PKGREVISION= 1
-SVR4_PKGNAME= p5tcs
-CATEGORIES= japanese perl5
-MASTER_SITES= http://www.daionet.gr.jp/~knok/chasen/
-
-PATCHFILES= ChaSen.pm-1.03-pod-fix.diff
-PATCH_SITES= http://www.daionet.gr.jp/~knok/chasen/
-
-MAINTAINER= kei@netbsd.org
-HOMEPAGE= http://www.daionet.gr.jp/~knok/chasen/
-COMMENT= perl5 module to use ChaSen
-
-USE_BUILDLINK_ONLY= YES
-PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Text/ChaSen/.packlist
-
-do-configure:
- @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
-.include "../../japanese/chasen/buildlink.mk"
-.include "../../lang/perl5/buildlink.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/japanese/p5-Text-ChaSen/PLIST b/japanese/p5-Text-ChaSen/PLIST
deleted file mode 100644
index 9a582163359..00000000000
--- a/japanese/p5-Text-ChaSen/PLIST
+++ /dev/null
@@ -1 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:29:30 zuntum Exp $
diff --git a/japanese/p5-Text-ChaSen/distinfo b/japanese/p5-Text-ChaSen/distinfo
deleted file mode 100644
index 59ecb8848f6..00000000000
--- a/japanese/p5-Text-ChaSen/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.4 2001/09/12 19:06:45 jlam Exp $
-
-SHA1 (Text-ChaSen-1.03.tar.gz) = e9634b0ba5cc6920d84039d0bf12e1608dd1a32f
-Size (Text-ChaSen-1.03.tar.gz) = 4836 bytes
-SHA1 (ChaSen.pm-1.03-pod-fix.diff) = f89708e63d73b6b29fb13a3b7f4802233ed175e6
-Size (ChaSen.pm-1.03-pod-fix.diff) = 239 bytes
diff --git a/japanese/p5-Text-Kakasi/DESCR b/japanese/p5-Text-Kakasi/DESCR
deleted file mode 100644
index 29a3f3b2d54..00000000000
--- a/japanese/p5-Text-Kakasi/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Text::Kakasi - Kakasi library module for perl.
-
-This is a module to use Kakasi, which is a language processing
-filter to convert Kanji characters to Hiragana, Katakana or
-Roman alphabetic Japanese, from perl.
diff --git a/japanese/p5-Text-Kakasi/Makefile b/japanese/p5-Text-Kakasi/Makefile
deleted file mode 100644
index 59d0214c659..00000000000
--- a/japanese/p5-Text-Kakasi/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2001/11/26 06:50:00 jlam Exp $
-
-DISTNAME= Text-Kakasi-1.04
-PKGNAME= p5-${DISTNAME}
-SVR4_PKGNAME= p5tka
-CATEGORIES= japanese perl5
-MASTER_SITES= http://www.daionet.gr.jp/~knok/kakasi/
-
-MAINTAINER= kei@netbsd.org
-HOMEPAGE= http://www.daionet.gr.jp/~knok/kakasi/
-COMMENT= perl5 module to use Kakasi
-
-USE_BUILDLINK_ONLY= YES
-PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Text/Kakasi/.packlist
-
-do-configure:
- @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
-.include "../../japanese/kakasi/buildlink.mk"
-.include "../../lang/perl5/buildlink.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/japanese/p5-Text-Kakasi/PLIST b/japanese/p5-Text-Kakasi/PLIST
deleted file mode 100644
index 9a582163359..00000000000
--- a/japanese/p5-Text-Kakasi/PLIST
+++ /dev/null
@@ -1 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:29:30 zuntum Exp $
diff --git a/japanese/p5-Text-Kakasi/distinfo b/japanese/p5-Text-Kakasi/distinfo
deleted file mode 100644
index 122bb722435..00000000000
--- a/japanese/p5-Text-Kakasi/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2001/11/26 06:50:00 jlam Exp $
-
-SHA1 (Text-Kakasi-1.04.tar.gz) = a0648751ecccdbf57e2619a5d5b73cf30ae19414
-Size (Text-Kakasi-1.04.tar.gz) = 15877 bytes
-SHA1 (patch-aa) = 109f7b1455df423ec1088a17ff1f7f1f0db6092f
diff --git a/japanese/p5-Text-Kakasi/patches/patch-aa b/japanese/p5-Text-Kakasi/patches/patch-aa
deleted file mode 100644
index e43adcd5a6f..00000000000
--- a/japanese/p5-Text-Kakasi/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2001/11/26 06:50:01 jlam Exp $
-
---- Makefile.PL.orig Wed Sep 29 02:55:02 1999
-+++ Makefile.PL
-@@ -3,7 +3,7 @@
- WriteMakefile(
- 'NAME' => 'Text::Kakasi',
- 'VERSION_FROM' => 'Kakasi.pm',
-- 'INC' => '-I/usr/local/include',
-- 'LIBS' => ['-L/usr/local/lib -lkakasi'],
-+ 'INC' => '',
-+ 'LIBS' => ['-lkakasi'],
- 'DEFINE' => '-DWAKATIGAKI',
- );
diff --git a/japanese/p5-jcode/DESCR b/japanese/p5-jcode/DESCR
deleted file mode 100644
index 8e9cd129287..00000000000
--- a/japanese/p5-jcode/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-jcode.pl is Perl library for Japanese character code conversion.
-It supports translation of each JIS, EUC, Shift JIS texts, and
-automatically recognizes the encode-method of the target text files.
-
-Document is in jcode.pl itself as comment.
-And jcode.pl-history file (in Japanese) might help you:
- ftp://ftp.iij.ad.jp/pub/IIJ/dist/utashiro/perl/jcode.pl-history
- ftp://ftp.sra.co.jp/pub/lang/perl/sra-scripts/jcode.pl-history
diff --git a/japanese/p5-jcode/Makefile b/japanese/p5-jcode/Makefile
deleted file mode 100644
index 9d527d9102b..00000000000
--- a/japanese/p5-jcode/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: Makefile,v 1.9 2001/11/26 06:50:01 jlam Exp $
-# FreeBSD Id: Makefile,v 1.2 1999/01/17 10:56:40 vanilla Exp $
-
-DISTNAME= jcode.pl-2.13
-PKGNAME= p5-jcode-2.13
-SVR4_PKGNAME= p5jc2
-CATEGORIES= japanese
-MASTER_SITES= ftp://ftp.iij.ad.jp/pub/IIJ/dist/utashiro/perl/ \
- ftp://ftp.sra.co.jp/pub/lang/perl/sra-scripts/
-EXTRACT_SUFX=
-
-MAINTAINER= tech-pkg-ja@jp.netbsd.org
-HOMEPAGE= # not available
-COMMENT= Perl library for Japanese character code conversion
-
-USE_BUILDLINK_ONLY= YES
-
-WRKSRC= ${WRKDIR}
-NO_BUILD= # defined
-EXTRACT_CMD= ${CP} ${DOWNLOADED_DISTFILE} .
-
-do-install:
- ${INSTALL_DATA_DIR} ${PERL5_SITELIB}
- ${INSTALL_DATA} ${WRKDIR}/${DISTNAME} ${PERL5_SITELIB}/jcode.pl
-
-.include "../../lang/perl5/buildlink.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/japanese/p5-jcode/PLIST b/japanese/p5-jcode/PLIST
deleted file mode 100644
index e5e2844f02f..00000000000
--- a/japanese/p5-jcode/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:29:31 zuntum Exp $
-${PERL5_SITELIB}/jcode.pl
diff --git a/japanese/p5-jcode/distinfo b/japanese/p5-jcode/distinfo
deleted file mode 100644
index ee9a8a03efd..00000000000
--- a/japanese/p5-jcode/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.3 2001/06/20 16:22:06 taca Exp $
-
-SHA1 (jcode.pl-2.13) = a123c07e86addb950cb3d9b7128cff03aba12c60
-Size (jcode.pl-2.13) = 21093 bytes
diff --git a/japanese/p5-nkf/DESCR b/japanese/p5-nkf/DESCR
deleted file mode 100644
index ffd81368e75..00000000000
--- a/japanese/p5-nkf/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-Nkf is a yet another kanji code converter among networks, hosts and terminals.
-It converts input kanji code to desig- nated kanji code such as 7-bit
-JIS, MS-kanji (shifted-JIS) or EUC.
-
-One of the most unique facicility of nkf is the guess of the input kanji
-code. It currently recognizes 7-bit JIS, MS- kanji (shifted-JIS) and EUC.
-So users needn't the input kanji code specification.
diff --git a/japanese/p5-nkf/Makefile b/japanese/p5-nkf/Makefile
deleted file mode 100644
index 10697d54390..00000000000
--- a/japanese/p5-nkf/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2001/11/26 06:50:01 jlam Exp $
-#
-
-DISTNAME= nkf-1.7
-PKGNAME= p5-nkf-1.7
-SVR4_PKGNAME= p5nkf
-CATEGORIES= japanese converters
-MASTER_SITES= ftp://ftp.sra.co.jp/pub/cmd/nkf/
-
-MAINTAINER= tech-pkg-ja@jp.netbsd.org
-COMMENT= Perl library for Network Kanji code conversion Filter
-
-USE_BUILDLINK_ONLY= YES
-PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/NKF/.packlist
-
-WRKSRC= ${WRKDIR}/${DISTNAME}/NKF
-
-do-configure:
- @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
-.include "../../lang/perl5/buildlink.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/japanese/p5-nkf/PLIST b/japanese/p5-nkf/PLIST
deleted file mode 100644
index 02462bb9c44..00000000000
--- a/japanese/p5-nkf/PLIST
+++ /dev/null
@@ -1 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:29:32 zuntum Exp $
diff --git a/japanese/p5-nkf/distinfo b/japanese/p5-nkf/distinfo
deleted file mode 100644
index 7c4e7ae2da1..00000000000
--- a/japanese/p5-nkf/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 10:13:36 wiz Exp $
-
-SHA1 (nkf-1.7.tar.gz) = 2116864c1acc8e6f80d4c59dc63c73eb37c9e80c
-Size (nkf-1.7.tar.gz) = 28222 bytes
diff --git a/japanese/qkc/DESCR b/japanese/qkc/DESCR
deleted file mode 100644
index a193df653ad..00000000000
--- a/japanese/qkc/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-Qkc is a kanji code converter capable of SHIFT-JIS, EUC and JIS.
-Unlike nkf, qkc can handle multiple files at a time. Qkc also has
-functionality to change end-of-line characters, ie, from CR+LF to LF,
-or to CR, and vice versa.
diff --git a/japanese/qkc/Makefile b/japanese/qkc/Makefile
deleted file mode 100644
index a13c152d3b0..00000000000
--- a/japanese/qkc/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/10/09 18:43:30 nra Exp $
-# FreeBSD: ports/japanese/qkc/Makefile,v 1.15 2001/05/10 11:42:23 max Exp
-
-DISTNAME= qkcc100
-PKGNAME= qkc-1.0
-CATEGORIES= japanese
-MASTER_SITES= http://hp.vector.co.jp/authors/VA000501/
-EXTRACT_SUFX= .zip
-
-MAINTAINER= hiramatu@boreas.dti.ne.jp
-HOMEPAGE= http://hp.vector.co.jp/authors/VA000501/
-COMMENT= Quick Kanji code Converter
-
-WRKSRC= ${WRKDIR}
-ALL_TARGET= qkc
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/qkc ${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/qkc.1 ${PREFIX}/man/ja_JP.EUC/man1
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/japanese/qkc/PLIST b/japanese/qkc/PLIST
deleted file mode 100644
index 73bd1da8a07..00000000000
--- a/japanese/qkc/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:29:33 zuntum Exp $
-bin/qkc
-man/ja_JP.EUC/man1/qkc.1
diff --git a/japanese/qkc/distinfo b/japanese/qkc/distinfo
deleted file mode 100644
index 582258d952c..00000000000
--- a/japanese/qkc/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2001/10/09 18:43:30 nra Exp $
-
-SHA1 (qkcc100.zip) = 25b5ecc5d34c76d6e784686621e5679aeb0ded66
-Size (qkcc100.zip) = 36308 bytes
diff --git a/japanese/ruby-romkan/DESCR b/japanese/ruby-romkan/DESCR
deleted file mode 100644
index 3c19f0c0694..00000000000
--- a/japanese/ruby-romkan/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-Ruby/Romkan is a Romaji <-> Kana conversion library for Ruby. It can
-convert a Japanese Romaji string to a Japanese Kana string or vice versa.
diff --git a/japanese/ruby-romkan/Makefile b/japanese/ruby-romkan/Makefile
deleted file mode 100644
index 9b54c64c23d..00000000000
--- a/japanese/ruby-romkan/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/03/06 15:56:20 taca Exp $
-
-DISTNAME= ruby-romkan-0.4
-CATEGORIES= japanese converters
-MASTER_SITES= http://namazu.org/~satoru/ruby-romkan/
-
-MAINTAINER= packages@netbsd.org
-HOMEPAGE= http://namazu.org/~satoru/ruby-romkan/
-COMMENT= Romaji <-> Kana conversion library for Ruby
-
-DIST_SUBDIR= ruby
-USE_RUBY_RD= # defined
-NO_CONFIGURE= # defined
-
-do-build:
- cd ${WRKSRC}; ${RUBY_RD} romkan.en.rd > romkan.html
- cd ${WRKSRC}; ${RUBY_RD} romkan.ja.rd > romkan.html.ja
-
-do-install:
- ${INSTALL_DATA} ${WRKSRC}/romkan.rb ${RUBY_SITELIBDIR}
- ${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/romkan
- ${INSTALL_DATA} ${WRKSRC}/romkan.html ${RUBY_DOCDIR}/romkan
- ${INSTALL_DATA} ${WRKSRC}/romkan.html.ja ${RUBY_DOCDIR}/romkan
- ${INSTALL_DATA} ${WRKSRC}/romkan.en.rd ${RUBY_DOCDIR}/romkan/romkan.rd
- ${INSTALL_DATA} ${WRKSRC}/romkan.ja.rd ${RUBY_DOCDIR}/romkan
-
-.include "../../textproc/ruby-rdtool/Makefile.common"
-.include "../../lang/ruby-base/Makefile.common"
-.include "../../mk/bsd.pkg.mk"
diff --git a/japanese/ruby-romkan/PLIST b/japanese/ruby-romkan/PLIST
deleted file mode 100644
index 7d6214f8f37..00000000000
--- a/japanese/ruby-romkan/PLIST
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/03/06 15:56:20 taca Exp $
-${RUBY_SITELIBDIR}/romkan.rb
-${RUBY_DOCDIR}/romkan/romkan.html
-${RUBY_DOCDIR}/romkan/romkan.html.ja
-${RUBY_DOCDIR}/romkan/romkan.ja.rd
-${RUBY_DOCDIR}/romkan/romkan.rd
-@dirrm ${RUBY_DOCDIR}/romkan
diff --git a/japanese/ruby-romkan/distinfo b/japanese/ruby-romkan/distinfo
deleted file mode 100644
index ae4cb4742bc..00000000000
--- a/japanese/ruby-romkan/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/03/06 15:56:20 taca Exp $
-
-SHA1 (ruby/ruby-romkan-0.4.tar.gz) = 316b95ac4c8914fd1020d9b0893c870ace68a144
-Size (ruby/ruby-romkan-0.4.tar.gz) = 4653 bytes
diff --git a/japanese/ruby-uconv/DESCR b/japanese/ruby-uconv/DESCR
deleted file mode 100644
index b7d28c5cc57..00000000000
--- a/japanese/ruby-uconv/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-This is an Unicode conversion library with Japanese codesets support
-for Ruby.
-
-Supported character encoding schemes are UCS-4, UTF-16, UTF-8, EUC-JP,
-CP932 (a variant of Shift_JIS for Japanese Windows).
-
-WWW: http://www.yoshidam.net/Ruby.html#uconv
diff --git a/japanese/ruby-uconv/Makefile b/japanese/ruby-uconv/Makefile
deleted file mode 100644
index 0d73aab8332..00000000000
--- a/japanese/ruby-uconv/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/03/27 13:52:52 taca Exp $
-# FreeBSD: ports/japanese/ruby-uconv/Makefile,v 1.8 2001/01/30 19:26:22 knu Exp
-
-DISTNAME= uconv-0.4.9
-PKGNAME= ${RUBY_PKGNAMEPREFIX}${DISTNAME}
-CATEGORIES= japanese converters
-MASTER_SITES= http://www.yoshidam.net/
-
-MAINTAINER= taca@netbsd.org
-HOMEPAGE= http://www.yoshidam.net/Ruby.html#uconv
-COMMENT= Unicode conversion library with Japanese codesets support
-
-DIST_SUBDIR= ruby
-USE_RUBY= yes
-USE_RUBY_EXTCONF= yes
-
-WRKSRC= ${WRKDIR}/uconv
-INSTALL_TARGET= site-install
-
-REPLACE_RUBY= samples/euc2unicode.rb samples/unicode2euc.rb \
- samples/xmlconv.rb
-EXAMPLES= euc2unicode.rb test_euc.txt test_euc.xml trilang.xml \
- unicode2euc.rb xmlconv.rb
-
-post-install:
- ${INSTALL_DATA_DIR} ${RUBY_EXAMPLESDIR}/uconv
-.for f in ${EXAMPLES}
- ${INSTALL_DATA} ${WRKSRC}/samples/${f} ${RUBY_EXAMPLESDIR}/uconv
-.endfor
- ${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/uconv
- ${INSTALL_DATA} ${WRKSRC}/README ${RUBY_DOCDIR}/uconv
- ${INSTALL_DATA} ${WRKSRC}/README.ja ${RUBY_DOCDIR}/uconv
-
-.include "../../lang/ruby-base/Makefile.common"
-.include "../../mk/bsd.pkg.mk"
diff --git a/japanese/ruby-uconv/PLIST b/japanese/ruby-uconv/PLIST
deleted file mode 100644
index cea1e4f7a04..00000000000
--- a/japanese/ruby-uconv/PLIST
+++ /dev/null
@@ -1,12 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/03/27 13:52:52 taca Exp $
-${RUBY_SITEARCHLIBDIR}/uconv.so
-${RUBY_DOCDIR}/uconv/README
-${RUBY_DOCDIR}/uconv/README.ja
-@dirrm ${RUBY_DOCDIR}/uconv
-${RUBY_EXAMPLESDIR}/uconv/euc2unicode.rb
-${RUBY_EXAMPLESDIR}/uconv/test_euc.txt
-${RUBY_EXAMPLESDIR}/uconv/test_euc.xml
-${RUBY_EXAMPLESDIR}/uconv/trilang.xml
-${RUBY_EXAMPLESDIR}/uconv/unicode2euc.rb
-${RUBY_EXAMPLESDIR}/uconv/xmlconv.rb
-@dirrm ${RUBY_EXAMPLESDIR}/uconv
diff --git a/japanese/ruby-uconv/distinfo b/japanese/ruby-uconv/distinfo
deleted file mode 100644
index dd228a29990..00000000000
--- a/japanese/ruby-uconv/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/03/27 13:52:52 taca Exp $
-
-SHA1 (ruby/uconv-0.4.9.tar.gz) = 28f5692fa4705fdefa19dc9fbc7470c0f01cc750
-Size (ruby/uconv-0.4.9.tar.gz) = 585698 bytes
diff --git a/japanese/sed/DESCR b/japanese/sed/DESCR
deleted file mode 100644
index 929f8f64ff5..00000000000
--- a/japanese/sed/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-This package is a multi-byte extented GNU SED. It accepts text which
-includes multi-byte character code. Supported multi-byte codes are
-2 byte EUC code and/or Shift-JIS code.
-
-Multi-byte code by WILLs(Katsuyuki Okabe, hgc02147@nifty.ne.jp)
-and t^2(Takahiro Tanimoto, NBC02362@niftyserve.or.jp).
diff --git a/japanese/sed/Makefile b/japanese/sed/Makefile
deleted file mode 100644
index 41939330fc6..00000000000
--- a/japanese/sed/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2002/02/18 15:14:23 seb Exp $
-# FreeBSD Id: Makefile,v 1.7 1999/01/27 07:41:18 fenner Exp $
-
-DISTNAME= sed-3.02
-PKGNAME= ja-sed-3.02
-CATEGORIES= japanese textproc
-MASTER_SITES= ${MASTER_SITE_GNU:=sed/}
-
-PATCH_SITES= http://member.nifty.ne.jp/wills/program/
-PATCHFILES= sedmb108.diff.gz
-PATCH_DIST_STRIP= -p1
-
-MAINTAINER= tech-pkg-ja@jp.netbsd.org
-HOMEPAGE= http://www.gnu.org/software/sed/sed.html
-COMMENT= GNU sed + multi-byte extension
-
-INFO_FILES= sed.info
-TEXINFO_OVERRIDE= YES
-
-USE_GMAKE= yes
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --program-transform-name='s,^,j,'
-
-post-install:
- @${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ja-sed
- @${INSTALL_DATA} ${WRKSRC}/OREADME.MB ${PREFIX}/share/doc/ja-sed
- @${INSTALL_DATA} ${WRKSRC}/README.MB ${PREFIX}/share/doc/ja-sed
-
-.include "../../mk/texinfo.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/japanese/sed/PLIST b/japanese/sed/PLIST
deleted file mode 100644
index fe6073a7d36..00000000000
--- a/japanese/sed/PLIST
+++ /dev/null
@@ -1,9 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:23 seb Exp $
-bin/jsed
-@unexec ${INSTALL_INFO} --delete %D/info/sed.info %D/info/dir
-info/sed.info
-@exec ${INSTALL_INFO} %D/info/sed.info %D/info/dir
-man/man1/jsed.1
-share/doc/ja-sed/OREADME.MB
-share/doc/ja-sed/README.MB
-@dirrm share/doc/ja-sed
diff --git a/japanese/sed/distinfo b/japanese/sed/distinfo
deleted file mode 100644
index 56736702b39..00000000000
--- a/japanese/sed/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 10:13:36 wiz Exp $
-
-SHA1 (sed-3.02.tar.gz) = 049d525abe926a7eec9d210d49181f5bf046f7b7
-Size (sed-3.02.tar.gz) = 264236 bytes
-SHA1 (sedmb108.diff.gz) = 6d89db379071b777c1706a03f9412067ca1282db
-Size (sedmb108.diff.gz) = 59516 bytes
-SHA1 (patch-aa) = 232eadc7bf171af0a05ef931b391e47787cafce2
diff --git a/japanese/sed/patches/patch-aa b/japanese/sed/patches/patch-aa
deleted file mode 100644
index 0d7dd54aaff..00000000000
--- a/japanese/sed/patches/patch-aa
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aa,v 1.3 1999/08/27 01:34:11 sakamoto Exp $
-
---- doc/Makefile.in.orig Fri Aug 27 09:21:12 1999
-+++ doc/Makefile.in Fri Aug 27 09:22:13 1999
-@@ -186,11 +186,4 @@
- done
- @$(POST_INSTALL)
-- @if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
-- list='$(INFO_DEPS)'; \
-- for file in $$list; do \
-- echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file";\
-- install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file || :;\
-- done; \
-- else : ; fi
-
- uninstall-info:
diff --git a/japanese/sj3-lib/DESCR b/japanese/sj3-lib/DESCR
deleted file mode 100644
index 3daaeb2d9b6..00000000000
--- a/japanese/sj3-lib/DESCR
+++ /dev/null
@@ -1,20 +0,0 @@
-This is SJ3 2.0.1.20, a Japanese input method.
-This system developed by Sony Corporation.
-SJ3 is composed of Kana-Kanji conversion server(sj3serv),
-Kana-Kanji conversion client for terminal(sj3) and Kana-Kanji
-conversion library(sj3lib).
-
-If you start up sj3serv, you must add a following entry into
-/etc/services file or NIS/YP services map.
-
-sj3 3086/tcp
-
-This port number may be changed by the setup file(See manpages).
-
-This also include many patches for FreeBSD or others.
-(Remove warning, support pseudo-terminal of FreeBSD,
- some bug fix and change make rules.) If there are any problem
-in this patches, please know me via E-mail.
-
-Hidekazu Kuroki
-(hidekazu@cs.titech.ac.jp)
diff --git a/japanese/sj3-lib/Makefile b/japanese/sj3-lib/Makefile
deleted file mode 100644
index 8f21d3fcee5..00000000000
--- a/japanese/sj3-lib/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2001/03/11 16:19:46 tron Exp $
-# FreeBSD Id: Makefile,v 1.9 1998/11/28 05:08:27 asami Exp $
-
-DISTNAME= sj3-2.0.1.20
-PKGNAME= sj3-lib-2.0.1.20
-CATEGORIES= japanese
-MASTER_SITES= ftp://ftp.sony.co.jp/pub/unsupported/src/ \
- ftp://ftp.cs.titech.ac.jp/pub/japanese/sj3/
-
-MAINTAINER= tech-pkg-ja@jp.netbsd.org
-COMMENT= Japanese input method (library)
-
-pre-configure:
- @${MV} ${WRKSRC}/Imakefile ${WRKSRC}/Imakefile.orig
- @${SED} -e 's|\(SUBDIRS = \).*\(sj3lib\).*|\1\2|' \
- ${WRKSRC}/Imakefile.orig > ${WRKSRC}/Imakefile
-
-do-configure:
- @(cd ${WRKSRC}; ${X11BASE}/bin/xmkmf; ${MAKE} Makefiles)
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/japanese/sj3-lib/PLIST b/japanese/sj3-lib/PLIST
deleted file mode 100644
index 580869580db..00000000000
--- a/japanese/sj3-lib/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:29:35 zuntum Exp $
-include/sj3lib.h
-lib/libsj3lib.a
diff --git a/japanese/sj3-lib/distinfo b/japanese/sj3-lib/distinfo
deleted file mode 100644
index be20a19c72b..00000000000
--- a/japanese/sj3-lib/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.3 2001/05/07 18:13:13 dmcmahill Exp $
-
-SHA1 (sj3-2.0.1.20.tar.gz) = b1cae59065ebc9caf5e198143ceb9558c932f259
-Size (sj3-2.0.1.20.tar.gz) = 584065 bytes
-SHA1 (patch-aa) = e2c60ca8709f8b78833ebc4f506b4cc63812a5bd
-SHA1 (patch-ab) = a64f78ccb3db3f4349f191abe47c6daebb2bbadd
-SHA1 (patch-ac) = a2a9c21618e7de1e56d371cb05cf866d549d50a1
-SHA1 (patch-ad) = be015448eb4ee267a2228838cc2a08e2586b0a85
-SHA1 (patch-ae) = 3b07eb2ea9d72049a8f322220836a631598ea7dc
-SHA1 (patch-af) = 33ac72303dfa13929d423ecaf5d9b7cb308f8ff5
-SHA1 (patch-ag) = b01fda538eb70a8f66cd42bcc719e24da848929f
diff --git a/japanese/sj3-lib/patches/patch-aa b/japanese/sj3-lib/patches/patch-aa
deleted file mode 100644
index 13d21484202..00000000000
--- a/japanese/sj3-lib/patches/patch-aa
+++ /dev/null
@@ -1,452 +0,0 @@
-$NetBSD: patch-aa,v 1.2 1999/08/02 11:28:36 sakamoto Exp $
-
-diff -arcN ../sj3-2.0.1.13.org/doc/doc/sj3lib.ms ./doc/doc/sj3lib.ms
-*** ../sj3-2.0.1.13.org/doc/doc/sj3lib.ms Fri Jun 3 17:00:49 1994
---- ./doc/doc/sj3lib.ms Tue Aug 13 03:17:26 1996
-***************
-*** 56,62 ****
- .IP ¡¦
- ¥á¥¤¥ó¼­½ñ¡¢¥æ¡¼¥¶¼­½ñ¡¢³Ø½¬¥Õ¥¡¥¤¥ë¤Ï¡¢Àܳ¤¹¤ë¥µ¡¼¥Ð¤ÎÆ°ºî¤·¤Æ¤¤¤ë¥Þ¥·¥ó¾å¤Î¤â¤Î¤¬»ÈÍѤµ¤ì¤Þ¤¹¡£
- .br
-! ¤³¤ì¤é¤Î¥Õ¥¡¥¤¥ë¤Ï¡¢¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¥Ç¥£¥ì¥¯¥È¥ê \fB/usr/dict/sj3\fP ¤Î²¼¤Ë¤ª¤«¤ì¤Þ¤¹¤¬¡¢¥µ¡¼¥Ð¤Î¥»¥Ã¥È¥¢¥Ã¥×¥Õ¥¡¥¤¥ë¤Ë¤è¤êÊѹ¹¤¬²Äǽ¤Ç¤¹¡£
- .IP ¡¦
- ¥æ¡¼¥¶¼­½ñ¤È³Ø½¬¥Õ¥¡¥¤¥ë¤Ï¡¢´Ø¿ô sj3_open ¤Ç»ØÄꤵ¤ì¤¿¥æ¡¼¥¶Ì¾¤ò USER ¤È
- ¤¹¤ì¤Ð¡¢\fBuser/USER/private.dic\fP ¤È \fBuser/USER/study.dat\fP ¤Ç¤¹¡£
---- 56,62 ----
- .IP ¡¦
- ¥á¥¤¥ó¼­½ñ¡¢¥æ¡¼¥¶¼­½ñ¡¢³Ø½¬¥Õ¥¡¥¤¥ë¤Ï¡¢Àܳ¤¹¤ë¥µ¡¼¥Ð¤ÎÆ°ºî¤·¤Æ¤¤¤ë¥Þ¥·¥ó¾å¤Î¤â¤Î¤¬»ÈÍѤµ¤ì¤Þ¤¹¡£
- .br
-! ¤³¤ì¤é¤Î¥Õ¥¡¥¤¥ë¤Ï¡¢¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¥Ç¥£¥ì¥¯¥È¥ê \fB/usr/local/lib/sj3/dict\fP ¤Î²¼¤Ë¤ª¤«¤ì¤Þ¤¹¤¬¡¢¥µ¡¼¥Ð¤Î¥»¥Ã¥È¥¢¥Ã¥×¥Õ¥¡¥¤¥ë¤Ë¤è¤êÊѹ¹¤¬²Äǽ¤Ç¤¹¡£
- .IP ¡¦
- ¥æ¡¼¥¶¼­½ñ¤È³Ø½¬¥Õ¥¡¥¤¥ë¤Ï¡¢´Ø¿ô sj3_open ¤Ç»ØÄꤵ¤ì¤¿¥æ¡¼¥¶Ì¾¤ò USER ¤È
- ¤¹¤ì¤Ð¡¢\fBuser/USER/private.dic\fP ¤È \fBuser/USER/study.dat\fP ¤Ç¤¹¡£
-***************
-*** 91,97 ****
- ¥µ¡¼¥Ð¤ÈÀµ¾ï¤ËÀܳ¤Ç¤­¤¿¤È¤­¤Ë¤Ï 0 ¤ò¡¢²¿¤«¥¨¥é¡¼¤Î¤¢¤Ã¤¿¤È¤­¤Ë¤Ï 0 °Ê³°¤Î
- ¥¨¥é¡¼¥¹¥Æ¡¼¥¿¥¹¤òÊÖ¤·¤Þ¤¹¡£
- .sp
-! ¥¨¥é¡¼¥¹¥Æ¡¼¥¿¥¹¤Ï¥Ø¥Ã¥À¥Õ¥¡¥¤¥ë \fB/usr/include/sj3lib.h\fP ¤Ç
- ÄêµÁ¤µ¤ì¤ë¥Ó¥Ã¥È¥¢¥µ¥¤¥ó¤µ¤ì¤¿Ãͤǡ¢¾ÜºÙ¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£
- .sp
- .IP "\fBSJ3_SERVER_DEAD\fP
---- 91,97 ----
- ¥µ¡¼¥Ð¤ÈÀµ¾ï¤ËÀܳ¤Ç¤­¤¿¤È¤­¤Ë¤Ï 0 ¤ò¡¢²¿¤«¥¨¥é¡¼¤Î¤¢¤Ã¤¿¤È¤­¤Ë¤Ï 0 °Ê³°¤Î
- ¥¨¥é¡¼¥¹¥Æ¡¼¥¿¥¹¤òÊÖ¤·¤Þ¤¹¡£
- .sp
-! ¥¨¥é¡¼¥¹¥Æ¡¼¥¿¥¹¤Ï¥Ø¥Ã¥À¥Õ¥¡¥¤¥ë \fB/usr/local/include/sj3lib.h\fP ¤Ç
- ÄêµÁ¤µ¤ì¤ë¥Ó¥Ã¥È¥¢¥µ¥¤¥ó¤µ¤ì¤¿Ãͤǡ¢¾ÜºÙ¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£
- .sp
- .IP "\fBSJ3_SERVER_DEAD\fP
-***************
-*** 138,144 ****
- ¥µ¡¼¥Ð¤È¤Î»ÈÍѤòÀµ¾ï¤Ë½ªÎ»¤Ç¤­¤¿¤È¤­¤Ë¤Ï 0 ¤ò¡¢
- ²¿¤«¥¨¥é¡¼¤Î¤¢¤Ã¤¿¤È¤­¤Ë¤Ï 0 °Ê³°¤Î¥¨¥é¡¼¥¹¥Æ¡¼¥¿¥¹¤òÊÖ¤·¤Þ¤¹¡£
- .sp
-! ¥¨¥é¡¼¥¹¥Æ¡¼¥¿¥¹¤Ï¥Ø¥Ã¥À¥Õ¥¡¥¤¥ë \fB/usr/include/sj3lib.h\fP ¤Ç
- ÄêµÁ¤µ¤ì¤ë¥Ó¥Ã¥È¥¢¥µ¥¤¥ó¤µ¤ì¤¿Ãͤǡ¢¾ÜºÙ¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£
- .sp
- .IP "\fBSJ3_SERVER_DEAD\fP
---- 138,144 ----
- ¥µ¡¼¥Ð¤È¤Î»ÈÍѤòÀµ¾ï¤Ë½ªÎ»¤Ç¤­¤¿¤È¤­¤Ë¤Ï 0 ¤ò¡¢
- ²¿¤«¥¨¥é¡¼¤Î¤¢¤Ã¤¿¤È¤­¤Ë¤Ï 0 °Ê³°¤Î¥¨¥é¡¼¥¹¥Æ¡¼¥¿¥¹¤òÊÖ¤·¤Þ¤¹¡£
- .sp
-! ¥¨¥é¡¼¥¹¥Æ¡¼¥¿¥¹¤Ï¥Ø¥Ã¥À¥Õ¥¡¥¤¥ë \fB/usr/local/include/sj3lib.h\fP ¤Ç
- ÄêµÁ¤µ¤ì¤ë¥Ó¥Ã¥È¥¢¥µ¥¤¥ó¤µ¤ì¤¿Ãͤǡ¢¾ÜºÙ¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£
- .sp
- .IP "\fBSJ3_SERVER_DEAD\fP
-***************
-*** 187,193 ****
- ÊÑ´¹·ë²Ì¤Î´Á»úʸ»úÎó¤ò¡¢ÇÛÎó \fBstruct bunsetu bun[]\fP ¤Ë
- ³ÆʸÀá¤Ë´Ø¤¹¤ë¾ðÊó¤ò¥»¥Ã¥È¤·¤Þ¤¹¡£
- .br
-! \fBstruct bunsetu\fP ¤Ï¥Ø¥Ã¥À¥Õ¥¡¥¤¥ë \fB/usr/include/sj3lib.h\fP ¤Ç
- Àë¸À¤µ¤ì¤Æ¤¤¤ë°Ê²¼¤Î¤è¤¦¤Ê¹½Â¤ÂΤǤ¹¡£
- .sp
- .RS
---- 187,193 ----
- ÊÑ´¹·ë²Ì¤Î´Á»úʸ»úÎó¤ò¡¢ÇÛÎó \fBstruct bunsetu bun[]\fP ¤Ë
- ³ÆʸÀá¤Ë´Ø¤¹¤ë¾ðÊó¤ò¥»¥Ã¥È¤·¤Þ¤¹¡£
- .br
-! \fBstruct bunsetu\fP ¤Ï¥Ø¥Ã¥À¥Õ¥¡¥¤¥ë \fB/usr/local/include/sj3lib.h\fP ¤Ç
- Àë¸À¤µ¤ì¤Æ¤¤¤ë°Ê²¼¤Î¤è¤¦¤Ê¹½Â¤ÂΤǤ¹¡£
- .sp
- .RS
-***************
-*** 417,423 ****
- ¤Ê¤ê¤Þ¤»¤ó¡£
- ¤Þ¤¿¤½¤ÎŤµ¤Ï¡¢ºÇÂç¤Ç¤â 32 ʸ»ú¤ò±Û¤¨¤Æ¤Ï¤Ê¤ê¤Þ¤»¤ó¡£
- .sp
-! Éʻ쥳¡¼¥É¤Ï¥Ø¥Ã¥À¥Õ¥¡¥¤¥ë \fB/usr/include/sj3lib.h\fP ¤Ç
- ÄêµÁ¤µ¤ì¤ë°Ê²¼¤ÎÉÊ»ì¤Î¤¦¤Á¤Î°ì¤Ä¤Ç¤¹¡£
- .sp
- .RS
---- 417,423 ----
- ¤Ê¤ê¤Þ¤»¤ó¡£
- ¤Þ¤¿¤½¤ÎŤµ¤Ï¡¢ºÇÂç¤Ç¤â 32 ʸ»ú¤ò±Û¤¨¤Æ¤Ï¤Ê¤ê¤Þ¤»¤ó¡£
- .sp
-! Éʻ쥳¡¼¥É¤Ï¥Ø¥Ã¥À¥Õ¥¡¥¤¥ë \fB/usr/local/include/sj3lib.h\fP ¤Ç
- ÄêµÁ¤µ¤ì¤ë°Ê²¼¤ÎÉÊ»ì¤Î¤¦¤Á¤Î°ì¤Ä¤Ç¤¹¡£
- .sp
- .RS
-***************
-*** 445,451 ****
- ÅÐÏ¿¤Ç¤­¤¿¤È¤­¤Ë¤Ï 0 ¤¬¡¢ÅÐÏ¿¤Ç¤­¤Ê¤«¤Ã¤¿¤È¤­¤Ë¤Ï¤½¤ì°Ê³°¤Î
- ¥¨¥é¡¼¥¹¥Æ¡¼¥¿¥¹¤¬ÊÖ¤µ¤ì¤Þ¤¹¡£
- .sp
-! ¥¨¥é¡¼¥¹¥Æ¡¼¥¿¥¹¤Ï¥Ø¥Ã¥À¥Õ¥¡¥¤¥ë \fB/usr/include/sj3lib.h\fP ¤Ç
- ÄêµÁ¤µ¤ì¡¢¾ÜºÙ¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£
- .sp
- .IP "\fBSJ3_DICT_ERROR\fP
---- 445,451 ----
- ÅÐÏ¿¤Ç¤­¤¿¤È¤­¤Ë¤Ï 0 ¤¬¡¢ÅÐÏ¿¤Ç¤­¤Ê¤«¤Ã¤¿¤È¤­¤Ë¤Ï¤½¤ì°Ê³°¤Î
- ¥¨¥é¡¼¥¹¥Æ¡¼¥¿¥¹¤¬ÊÖ¤µ¤ì¤Þ¤¹¡£
- .sp
-! ¥¨¥é¡¼¥¹¥Æ¡¼¥¿¥¹¤Ï¥Ø¥Ã¥À¥Õ¥¡¥¤¥ë \fB/usr/local/include/sj3lib.h\fP ¤Ç
- ÄêµÁ¤µ¤ì¡¢¾ÜºÙ¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£
- .sp
- .IP "\fBSJ3_DICT_ERROR\fP
-***************
-*** 519,525 ****
- ¤Ê¤ê¤Þ¤»¤ó¡£
- ¤Þ¤¿¤½¤ÎŤµ¤Ï¡¢ºÇÂç¤Ç¤â 32 ʸ»ú¤ò±Û¤¨¤Æ¤Ï¤Ê¤ê¤Þ¤»¤ó¡£
- .sp
-! Éʻ쥳¡¼¥É¤Ï \fB/usr/include/sj3lib.h\fP ¤ÇÄêµÁ¤µ¤ì¤ë°Ê²¼¤ÎÉÊ»ì¤Î
- ¤¦¤Á¤Î°ì¤Ä¤Ç¤¹¡£
- .sp
- .RS
---- 519,525 ----
- ¤Ê¤ê¤Þ¤»¤ó¡£
- ¤Þ¤¿¤½¤ÎŤµ¤Ï¡¢ºÇÂç¤Ç¤â 32 ʸ»ú¤ò±Û¤¨¤Æ¤Ï¤Ê¤ê¤Þ¤»¤ó¡£
- .sp
-! Éʻ쥳¡¼¥É¤Ï \fB/usr/local/include/sj3lib.h\fP ¤ÇÄêµÁ¤µ¤ì¤ë°Ê²¼¤ÎÉÊ»ì¤Î
- ¤¦¤Á¤Î°ì¤Ä¤Ç¤¹¡£
- .sp
- .RS
-***************
-*** 547,553 ****
- ºï½ü¤Ç¤­¤¿¤È¤­¤Ë¤Ï 0 ¤¬¡¢ºï½ü¤Ç¤­¤Ê¤«¤Ã¤¿¤È¤­¤Ë¤Ï¤½¤ì°Ê³°¤Î
- ¥¨¥é¡¼¥¹¥Æ¡¼¥¿¥¹¤¬ÊÖ¤µ¤ì¤Þ¤¹¡£
- .sp
-! ¥¨¥é¡¼¥¹¥Æ¡¼¥¿¥¹¤Ï \fB/usr/include/sj3lib.h\fP ¤ÇÄêµÁ¤µ¤ì¡¢
- ¾ÜºÙ¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£
- .sp
- .IP "\fBSJ3_DICT_ERROR\fP
---- 547,553 ----
- ºï½ü¤Ç¤­¤¿¤È¤­¤Ë¤Ï 0 ¤¬¡¢ºï½ü¤Ç¤­¤Ê¤«¤Ã¤¿¤È¤­¤Ë¤Ï¤½¤ì°Ê³°¤Î
- ¥¨¥é¡¼¥¹¥Æ¡¼¥¿¥¹¤¬ÊÖ¤µ¤ì¤Þ¤¹¡£
- .sp
-! ¥¨¥é¡¼¥¹¥Æ¡¼¥¿¥¹¤Ï \fB/usr/local/include/sj3lib.h\fP ¤ÇÄêµÁ¤µ¤ì¡¢
- ¾ÜºÙ¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£
- .sp
- .IP "\fBSJ3_DICT_ERROR\fP
-diff -arcN ../sj3-2.0.1.13.org/doc/doc/sj3serv.ms ./doc/doc/sj3serv.ms
-*** ../sj3-2.0.1.13.org/doc/doc/sj3serv.ms Fri Jun 3 17:00:50 1994
---- ./doc/doc/sj3serv.ms Tue Aug 13 03:18:01 1996
-***************
-*** 111,117 ****
- ¤½¤Î¥Õ¥¡¥¤¥ë̾¤òÀäÂХѥ¹¤È¤·¤Æ¼­½ñ¤Ë¥¢¥¯¥»¥¹¤·¤Þ¤¹¤¬¡¢\'/\'°Ê³°¤Î¤È¤­¤Ë¤Ï¡¢
- ¤³¤³¤Ç»ØÄꤵ¤ì¤ë¥Ç¥£¥ì¥¯¥È¥ê¤«¤é¤ÎÁêÂХѥ¹¤È¤·¤Æ¼­½ñ¤Ë¥¢¥¯¥»¥¹¤·¤Þ¤¹¡£
- .br
-! ¥Ç¥Õ¥©¥ë¥È¤Ï /usr/dict/sj3 ¤Ç¤¹¡£
- .RE
- .sp
- .NH 3
---- 111,117 ----
- ¤½¤Î¥Õ¥¡¥¤¥ë̾¤òÀäÂХѥ¹¤È¤·¤Æ¼­½ñ¤Ë¥¢¥¯¥»¥¹¤·¤Þ¤¹¤¬¡¢\'/\'°Ê³°¤Î¤È¤­¤Ë¤Ï¡¢
- ¤³¤³¤Ç»ØÄꤵ¤ì¤ë¥Ç¥£¥ì¥¯¥È¥ê¤«¤é¤ÎÁêÂХѥ¹¤È¤·¤Æ¼­½ñ¤Ë¥¢¥¯¥»¥¹¤·¤Þ¤¹¡£
- .br
-! ¥Ç¥Õ¥©¥ë¥È¤Ï /usr/local/lib/sj3/dict ¤Ç¤¹¡£
- .RE
- .sp
- .NH 3
-diff -arcN ../sj3-2.0.1.13.org/doc/man/sj3.1 ./doc/man/sj3.1
-*** ../sj3-2.0.1.13.org/doc/man/sj3.1 Fri Jun 3 17:00:51 1994
---- ./doc/man/sj3.1 Tue Aug 13 03:18:59 1996
-***************
-*** 109,121 ****
- .SH ´ØÏ¢¥Õ¥¡¥¤¥ë
- .PD 0
- .TP 15
-! /usr/dict/sj3/user/$USER/private.dic
- ²¾Ì¾´Á»úÊÑ´¹¥æ¡¼¥¶¼­½ñ
- .TP
-! /usr/dict/sj3/user/$USER/study.dat
- ²¾Ì¾´Á»úÊÑ´¹³Ø½¬¥Õ¥¡¥¤¥ë
- .TP
-! /usr/lib/sj3/sjrk
- ¥Ç¥Õ¥©¥ë¥È¥í¡¼¥Þ»ú²¾Ì¾ÊÑ´¹µ¬Â§ÄêµÁ¥Õ¥¡¥¤¥ë
- .SH ´ØÏ¢»ö¹à
- sj3serv(1), sj3lib(3)
---- 109,121 ----
- .SH ´ØÏ¢¥Õ¥¡¥¤¥ë
- .PD 0
- .TP 15
-! /usr/local/lib/sj3/dict/user/$USER/private.dic
- ²¾Ì¾´Á»úÊÑ´¹¥æ¡¼¥¶¼­½ñ
- .TP
-! /usr/local/lib/sj3/dict/user/$USER/study.dat
- ²¾Ì¾´Á»úÊÑ´¹³Ø½¬¥Õ¥¡¥¤¥ë
- .TP
-! /usr/local/lib/sj3/sjrk
- ¥Ç¥Õ¥©¥ë¥È¥í¡¼¥Þ»ú²¾Ì¾ÊÑ´¹µ¬Â§ÄêµÁ¥Õ¥¡¥¤¥ë
- .SH ´ØÏ¢»ö¹à
- sj3serv(1), sj3lib(3)
-diff -arcN ../sj3-2.0.1.13.org/doc/man/sj3dic.1 ./doc/man/sj3dic.1
-*** ../sj3-2.0.1.13.org/doc/man/sj3dic.1 Fri Jun 3 17:00:52 1994
---- ./doc/man/sj3dic.1 Tue Aug 13 03:19:55 1996
-***************
-*** 105,120 ****
- .SH ´ØÏ¢¥Õ¥¡¥¤¥ë
- .PD 0
- .TP \w'\ \ \ \ user/\fIusername\fP/private.dic'u+2n
-! /usr/bin/sj3serv
- ¤«¤Ê´Á»úÊÑ´¹¥µ¡¼¥Ð
- .TP
-! /usr/lib/sj3/serverrc
- ¤«¤Ê´Á»úÊÑ´¹¥µ¡¼¥Ð ¥»¥Ã¥È¥¢¥Ã¥×¥Õ¥¡¥¤¥ë
- .TP
-! /usr/bin/sj3
- ÆüËܸìÆþÎÏ¥Õ¥í¥ó¥È¥¨¥ó¥É¥×¥í¥»¥Ã¥µ
- .TP
-! /usr/dict/sj3/
- ¤«¤Ê´Á»úÊÑ´¹¥µ¡¼¥Ð ¥Ç¥Õ¥©¥ë¥È¼­½ñ¥Ç¥£¥ì¥¯¥È¥ê
- .TP
- sj3main.dic
---- 105,120 ----
- .SH ´ØÏ¢¥Õ¥¡¥¤¥ë
- .PD 0
- .TP \w'\ \ \ \ user/\fIusername\fP/private.dic'u+2n
-! /usr/local/bin/sj3serv
- ¤«¤Ê´Á»úÊÑ´¹¥µ¡¼¥Ð
- .TP
-! /usr/local/lib/sj3/serverrc
- ¤«¤Ê´Á»úÊÑ´¹¥µ¡¼¥Ð ¥»¥Ã¥È¥¢¥Ã¥×¥Õ¥¡¥¤¥ë
- .TP
-! /usr/local/bin/sj3
- ÆüËܸìÆþÎÏ¥Õ¥í¥ó¥È¥¨¥ó¥É¥×¥í¥»¥Ã¥µ
- .TP
-! /usr/local/lib/sj3/dict/
- ¤«¤Ê´Á»úÊÑ´¹¥µ¡¼¥Ð ¥Ç¥Õ¥©¥ë¥È¼­½ñ¥Ç¥£¥ì¥¯¥È¥ê
- .TP
- sj3main.dic
-***************
-*** 126,135 ****
- user/\fIusername\fP/study.dat
- ¤«¤Ê´Á»úÊÑ´¹³Ø½¬¥Õ¥¡¥¤¥ë
- .TP
-! /usr/include/sj3lib.h
- ¤«¤Ê´Á»úÊÑ´¹¥é¥¤¥Ö¥é¥êÍÑ¥¤¥ó¥¯¥ë¡¼¥É¥Õ¥¡¥¤¥ë
- .TP
-! /usr/lib/libsj3lib.a
- ¤«¤Ê´Á»úÊÑ´¹¥é¥¤¥Ö¥é¥ê
- .\".TP
- .\"/usr/sony/demo/sj3/*
---- 126,135 ----
- user/\fIusername\fP/study.dat
- ¤«¤Ê´Á»úÊÑ´¹³Ø½¬¥Õ¥¡¥¤¥ë
- .TP
-! /usr/local/include/sj3lib.h
- ¤«¤Ê´Á»úÊÑ´¹¥é¥¤¥Ö¥é¥êÍÑ¥¤¥ó¥¯¥ë¡¼¥É¥Õ¥¡¥¤¥ë
- .TP
-! /usr/local/lib/libsj3lib.a
- ¤«¤Ê´Á»úÊÑ´¹¥é¥¤¥Ö¥é¥ê
- .\".TP
- .\"/usr/sony/demo/sj3/*
-diff -arcN ../sj3-2.0.1.13.org/doc/man/sj3mkdic.1 ./doc/man/sj3mkdic.1
-*** ../sj3-2.0.1.13.org/doc/man/sj3mkdic.1 Fri Dec 9 18:15:37 1994
---- ./doc/man/sj3mkdic.1 Tue Aug 13 03:20:17 1996
-***************
-*** 550,565 ****
- .SH ¥Õ¥¡¥¤¥ë
- .PD 0
- .TP \w'\ \ \ \ user/\f2username\f1/private.dic'u+2n
-! .B /usr/bin/sj3serv
- ¤«¤Ê´Á»úÊÑ´¹¥µ¡¼¥Ð
- .TP
-! .B /usr/lib/sj3/serverrc
- ¤«¤Ê´Á»úÊÑ´¹¥µ¡¼¥Ð ¥»¥Ã¥È¥¢¥Ã¥×¥Õ¥¡¥¤¥ë
- .TP
-! .B /usr/bin/sj3
- ÆüËܸìÆþÎÏ¥Õ¥í¥ó¥È¥¨¥ó¥É¥×¥í¥»¥Ã¥µ
- .TP
-! .B /usr/dict/sj3/
- ¤«¤Ê´Á»úÊÑ´¹¥µ¡¼¥Ð ¥Ç¥Õ¥©¥ë¥È¼­½ñ¥Ç¥£¥ì¥¯¥È¥ê
- .TP
- .B " sj3main.dic
---- 550,565 ----
- .SH ¥Õ¥¡¥¤¥ë
- .PD 0
- .TP \w'\ \ \ \ user/\f2username\f1/private.dic'u+2n
-! .B /usr/local/bin/sj3serv
- ¤«¤Ê´Á»úÊÑ´¹¥µ¡¼¥Ð
- .TP
-! .B /usr/local/lib/sj3/serverrc
- ¤«¤Ê´Á»úÊÑ´¹¥µ¡¼¥Ð ¥»¥Ã¥È¥¢¥Ã¥×¥Õ¥¡¥¤¥ë
- .TP
-! .B /usr/local/bin/sj3
- ÆüËܸìÆþÎÏ¥Õ¥í¥ó¥È¥¨¥ó¥É¥×¥í¥»¥Ã¥µ
- .TP
-! .B /usr/local/lib/sj3/dict/
- ¤«¤Ê´Á»úÊÑ´¹¥µ¡¼¥Ð ¥Ç¥Õ¥©¥ë¥È¼­½ñ¥Ç¥£¥ì¥¯¥È¥ê
- .TP
- .B " sj3main.dic
-***************
-*** 571,584 ****
- .B " user/\f2username\f1/study.dat
- ¤«¤Ê´Á»úÊÑ´¹³Ø½¬¥Õ¥¡¥¤¥ë
- .TP
-! .B /usr/include/sj3lib.h
- ¤«¤Ê´Á»úÊÑ´¹¥é¥¤¥Ö¥é¥êÍÑ¥¤¥ó¥¯¥ë¡¼¥É¥Õ¥¡¥¤¥ë
- .TP
-! .B /usr/lib/libsj3lib.a
- ¤«¤Ê´Á»úÊÑ´¹¥é¥¤¥Ö¥é¥ê
-! .TP
-! \f3/usr/demo/sj3/ *\f1
-! ¤«¤Ê´Á»úÊÑ´¹¥é¥¤¥Ö¥é¥ê »ÈÍÑË¡¥µ¥ó¥×¥ë
- .PD
- .SH ´ØÏ¢¹àÌÜ
- \f4sj3\f1 (1),
---- 571,584 ----
- .B " user/\f2username\f1/study.dat
- ¤«¤Ê´Á»úÊÑ´¹³Ø½¬¥Õ¥¡¥¤¥ë
- .TP
-! .B /usr/local/include/sj3lib.h
- ¤«¤Ê´Á»úÊÑ´¹¥é¥¤¥Ö¥é¥êÍÑ¥¤¥ó¥¯¥ë¡¼¥É¥Õ¥¡¥¤¥ë
- .TP
-! .B /usr/local/lib/libsj3lib.a
- ¤«¤Ê´Á»úÊÑ´¹¥é¥¤¥Ö¥é¥ê
-! .\".TP
-! .\"\f3/usr/local/demo/sj3/ *\f1
-! .\"¤«¤Ê´Á»úÊÑ´¹¥é¥¤¥Ö¥é¥ê »ÈÍÑË¡¥µ¥ó¥×¥ë
- .PD
- .SH ´ØÏ¢¹àÌÜ
- \f4sj3\f1 (1),
-diff -arcN ../sj3-2.0.1.13.org/doc/man/sj3serv.1 ./doc/man/sj3serv.1
-*** ../sj3-2.0.1.13.org/doc/man/sj3serv.1 Fri Jun 3 17:00:53 1994
---- ./doc/man/sj3serv.1 Tue Aug 13 03:20:41 1996
-***************
-*** 47,63 ****
- ¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢\fIsj3serv\fP ¤ÎÆɤ߹þ¤à¥»¥Ã¥È¥¢¥Ã¥×¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Þ¤¹¡£
- .br
- \fIsj3serv\fP ¤Ï¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¥»¥Ã¥È¥¢¥Ã¥×¥Õ¥¡¥¤¥ë
-! ¡Æ/usr/lib/sj3/serverrc¡Ç¤òÆɤ߹þ¤ß¤Þ¤¹¤¬¡¢
- ¤³¤Î¥ª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤¿¤È¤­¤Ë¤Ï¤«¤ï¤ê¤Ë
- ¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç»ØÄꤵ¤ì¤¿¥»¥Ã¥È¥¢¥Ã¥×¥Õ¥¡¥¤¥ë¤òÆɤ߹þ¤ß¤Þ¤¹¡£
- .br
- .SH ´ØÏ¢¥Õ¥¡¥¤¥ë
- .PD 0
- .TP \w'\ \ \ \ user/\fIusername\fP/private.dic'u+2n
-! /usr/lib/sj3/serverrc
- ¥Ç¥Õ¥©¥ë¥È²¾Ì¾ÊÑ´¹¥µ¡¼¥Ð ¥»¥Ã¥È¥¢¥Ã¥×¥Õ¥¡¥¤¥ë
- .TP
-! /usr/sony/dict/sj3/
- ¤«¤Ê´Á»úÊÑ´¹¥µ¡¼¥Ð ¥Ç¥Õ¥©¥ë¥È¼­½ñ¥Ç¥£¥ì¥¯¥È¥ê
- .TP
- sj3main.dic
---- 47,63 ----
- ¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢\fIsj3serv\fP ¤ÎÆɤ߹þ¤à¥»¥Ã¥È¥¢¥Ã¥×¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Þ¤¹¡£
- .br
- \fIsj3serv\fP ¤Ï¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¥»¥Ã¥È¥¢¥Ã¥×¥Õ¥¡¥¤¥ë
-! ¡Æ/usr/local/lib/sj3/serverrc¡Ç¤òÆɤ߹þ¤ß¤Þ¤¹¤¬¡¢
- ¤³¤Î¥ª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤¿¤È¤­¤Ë¤Ï¤«¤ï¤ê¤Ë
- ¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç»ØÄꤵ¤ì¤¿¥»¥Ã¥È¥¢¥Ã¥×¥Õ¥¡¥¤¥ë¤òÆɤ߹þ¤ß¤Þ¤¹¡£
- .br
- .SH ´ØÏ¢¥Õ¥¡¥¤¥ë
- .PD 0
- .TP \w'\ \ \ \ user/\fIusername\fP/private.dic'u+2n
-! /usr/local/lib/sj3/serverrc
- ¥Ç¥Õ¥©¥ë¥È²¾Ì¾ÊÑ´¹¥µ¡¼¥Ð ¥»¥Ã¥È¥¢¥Ã¥×¥Õ¥¡¥¤¥ë
- .TP
-! /usr/local/lib/sj3/dict/
- ¤«¤Ê´Á»úÊÑ´¹¥µ¡¼¥Ð ¥Ç¥Õ¥©¥ë¥È¼­½ñ¥Ç¥£¥ì¥¯¥È¥ê
- .TP
- sj3main.dic
-diff -arcN ../sj3-2.0.1.13.org/server/setup.c ./server/setup.c
-*** ../sj3-2.0.1.13.org/server/setup.c Fri Dec 9 20:27:07 1994
---- ./server/setup.c Mon Aug 12 23:58:25 1996
-***************
-*** 221,250 ****
- u_char *(*optfunc)();
- int optarg;
- } option[] = {
- "DebugOut", get_str, (int)&debug_file,
- "DebugLevel", get_int, (int)&debug_level,
- "ForkFlag", get_flag, (int)&fork_flag,
-
- "PortName", get_str, (int)&port_name,
- #ifdef TLI
- "PortNumber", get_str, (int)&port_number,
-! "ProtoName", get_str, (int)&proto_name,
- #else
- "PortNumber", get_int, (int)&port_number,
- #endif
- "SocketName", get_str, (int)&socket_name,
- #ifdef LOCK_FILE
- "LockFile", get_str, (int)&lock_file;
- #endif
-
- "maxclient", get_int, (int)&max_client,
- "dictdir", get_str, (int)&dict_dir,
- "readdict", get_list, (int)&read_dict,
- "opendict", get_list, (int)&open_dict,
- "errorout", get_str, (int)&error_file,
- "logout", get_str, (int)&log_file,
- "dirmode", get_int, (int)&dir_mode,
- "filemode", get_int, (int)&file_mode,
- "allowuser", get_list, (int)&allow_user,
- 0, 0, 0
- };
---- 221,273 ----
- u_char *(*optfunc)();
- int optarg;
- } option[] = {
-+ /*
-+ * Add option flag.
-+ * Because They are lacked in here. See document.
-+ * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp) 1996/8/10
-+ */
- "DebugOut", get_str, (int)&debug_file,
-+ "debugout", get_str, (int)&debug_file,
- "DebugLevel", get_int, (int)&debug_level,
-+ "debuglevel", get_int, (int)&debug_level,
- "ForkFlag", get_flag, (int)&fork_flag,
-+ "forkflag", get_flag, (int)&fork_flag,
-
- "PortName", get_str, (int)&port_name,
-+ "portname", get_str, (int)&port_name,
- #ifdef TLI
- "PortNumber", get_str, (int)&port_number,
-! "portnumber", get_str, (int)&port_number,
-! "ProtoName", get_str, (int)&proto_name,
-! "protoname", get_str, (int)&proto_name,
- #else
- "PortNumber", get_int, (int)&port_number,
-+ "portnumber", get_int, (int)&port_number,
- #endif
- "SocketName", get_str, (int)&socket_name,
-+ "socketname", get_str, (int)&socket_name,
- #ifdef LOCK_FILE
- "LockFile", get_str, (int)&lock_file;
-+ "lockfile", get_str, (int)&lock_file;
- #endif
-
-+ "MaxClient", get_int, (int)&max_client,
- "maxclient", get_int, (int)&max_client,
-+ "DictDir", get_str, (int)&dict_dir,
- "dictdir", get_str, (int)&dict_dir,
-+ "ReadDict", get_list, (int)&read_dict,
- "readdict", get_list, (int)&read_dict,
-+ "OpenDict", get_list, (int)&open_dict,
- "opendict", get_list, (int)&open_dict,
-+ "ErrorOut", get_str, (int)&error_file,
- "errorout", get_str, (int)&error_file,
-+ "LogOut", get_str, (int)&log_file,
- "logout", get_str, (int)&log_file,
-+ "DirMode", get_int, (int)&dir_mode,
- "dirmode", get_int, (int)&dir_mode,
-+ "FileMode", get_int, (int)&file_mode,
- "filemode", get_int, (int)&file_mode,
-+ "AllowUser", get_list, (int)&allow_user,
- "allowuser", get_list, (int)&allow_user,
- 0, 0, 0
- };
diff --git a/japanese/sj3-lib/patches/patch-ab b/japanese/sj3-lib/patches/patch-ab
deleted file mode 100644
index 6729009942a..00000000000
--- a/japanese/sj3-lib/patches/patch-ab
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ab,v 1.3 1999/12/08 09:35:10 rh Exp $
-
---- include/Const.h.orig Thu Jan 23 12:20:52 1997
-+++ include/Const.h Wed Dec 8 10:33:54 1999
-@@ -70,7 +70,15 @@
- #define ProtoName "tcp"
- #define PortNumber "3000"
- #else
-+/*
-+ * Change the default Port number of sj3 for FreeBSD.
-+ * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp) 1996/8/20
-+ */
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+#define PortNumber 3086
-+#else /* ! __FreeBSD__ __NetBSD__ __OpenBSD__ */
- #define PortNumber 3000
-+#endif /* ! __FreeBSD__ __NetBSD__ __OpenBSD__ */
- #endif
- #define DirectryMode 0755
- #define DictFileMode 0644
diff --git a/japanese/sj3-lib/patches/patch-ac b/japanese/sj3-lib/patches/patch-ac
deleted file mode 100644
index 843f5eef22b..00000000000
--- a/japanese/sj3-lib/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.2 1999/08/02 11:28:36 sakamoto Exp $
-
---- dict/dict/Imakefile.~1~ Thu Jan 23 20:20:51 1997
-+++ dict/dict/Imakefile Tue Aug 18 10:51:14 1998
-@@ -48,7 +48,7 @@
-
- XCOMM INSTFLAGS = -o $(SJ3OWNER) -g $(SJ3GROUP) -m 444
-
--all: $(OBJS)
-+all:: $(OBJS)
-
- $(OBJS): $(SRCS)
- $(TOOL_DIR)/$(TOOL_NAME) $(SRCS) $(OBJS) > $(OUTPUT)
diff --git a/japanese/sj3-lib/patches/patch-ad b/japanese/sj3-lib/patches/patch-ad
deleted file mode 100644
index ce2e055fcc6..00000000000
--- a/japanese/sj3-lib/patches/patch-ad
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-ad,v 1.2 1999/08/02 11:28:36 sakamoto Exp $
-
---- sj3.tmpl.orig Thu Jan 23 20:20:58 1997
-+++ sj3.tmpl Fri Jul 30 20:27:08 1999
-@@ -32,12 +32,12 @@
- * $SonyDate: 1997/01/23 11:20:57 $
- */
-
--SJ3TOP = /usr/local
-+SJ3TOP = $(PREFIX)
- SJ3BINDIR = $(SJ3TOP)/bin
- SJ3HDRDIR = $(SJ3TOP)/include
- SJ3LIBDIR = $(SJ3TOP)/lib
--SJ3CONFDIR = $(SJ3TOP)/lib/sj3
--SJ3DICTDIR = $(SJ3CONFDIR)/dict
-+SJ3CONFDIR = $(SJ3TOP)/share/sj3
-+SJ3DICTDIR = $(DICT_DIR)/sj3
-
- /*
- * Change for FreeBSD.
-@@ -45,10 +45,11 @@
- * return NULL, use it in library libxpg4
- * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp) 1996/8/10
- */
-+#if 0
- #if defined(FreeBSDArchitecture)
-
- CODE_LIBS = -lxpg4
--SJ3OWNER = root
-+SJ3OWNER = bin
- SJ3GROUP = bin
-
- #else
-@@ -61,4 +62,5 @@
- SJ3GROUP = staff
- #endif
-
-+#endif
- #endif
diff --git a/japanese/sj3-lib/patches/patch-ae b/japanese/sj3-lib/patches/patch-ae
deleted file mode 100644
index f5eb2edace4..00000000000
--- a/japanese/sj3-lib/patches/patch-ae
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ae,v 1.2 1999/08/02 11:28:36 sakamoto Exp $
-
---- include/Paths.h.in.orig Thu Jan 23 20:20:57 1997
-+++ include/Paths.h.in Tue Aug 18 11:29:00 1998
-@@ -33,7 +33,22 @@
- * $SonyDate: 1997/01/23 11:20:55 $
- */
-
--#define ErrorOutFile "/dev/console"
-+/*
-+ * Change ErrotOutFile variable.
-+ * Because suppress a error when sj3serv start up, change to "/dev/stderr".
-+ * This error is "Cannot Open "/dev/console".".
-+ * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp) 1996/8/10
-+ *
-+ * Change ErrotOutFile variable.
-+ * This default value is "/dev/null" in document.
-+ * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp) 1996/8/11
-+ */
-+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
-+#define ErrorOutFile "/dev/console"
-+#else
-+/* #define ErrorOutFile "/dev/stderr" */ /* for test */
-+#define ErrorOutFile "/dev/null"
-+#endif
-
- #define SocketName "/tmp/sj3sock"
- #define LockFile "/tmp/SJ3SERV.EXIST"
diff --git a/japanese/sj3-lib/patches/patch-af b/japanese/sj3-lib/patches/patch-af
deleted file mode 100644
index 70c7174f02a..00000000000
--- a/japanese/sj3-lib/patches/patch-af
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-af,v 1.2 1999/08/02 11:28:36 sakamoto Exp $
-
---- server/main.c.orig Mon Mar 23 19:48:03 1998
-+++ server/main.c Mon Aug 2 19:26:45 1999
-@@ -215,9 +215,11 @@
- (void) setlocale(LC_CTYPE, "ja_JP.EUC");
- #endif
- opening();
-+#ifndef __NetBSD__
- if (setuid(geteuid())) {
- fprintf(stderr, "error at setuid.\r\n"); exit(1);
- }
-+#endif
-
- parse_arg(argc, argv);
- read_runcmd();
diff --git a/japanese/sj3-lib/patches/patch-ag b/japanese/sj3-lib/patches/patch-ag
deleted file mode 100644
index 45a134aaa98..00000000000
--- a/japanese/sj3-lib/patches/patch-ag
+++ /dev/null
@@ -1,95 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2001/05/07 18:13:13 dmcmahill Exp $
-
---- server/setup.c.orig Mon May 7 12:15:08 2001
-+++ server/setup.c Mon May 7 12:50:19 2001
-@@ -220,5 +220,5 @@
- char *optname;
- u_char *(*optfunc)();
-- int optarg;
-+ long int optarg;
- } option[] = {
- /*
-@@ -227,47 +227,47 @@
- * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp) 1996/8/10
- */
-- "DebugOut", get_str, (int)&debug_file,
-- "debugout", get_str, (int)&debug_file,
-- "DebugLevel", get_int, (int)&debug_level,
-- "debuglevel", get_int, (int)&debug_level,
-- "ForkFlag", get_flag, (int)&fork_flag,
-- "forkflag", get_flag, (int)&fork_flag,
-+ "DebugOut", get_str, (long int)&debug_file,
-+ "debugout", get_str, (long int)&debug_file,
-+ "DebugLevel", get_int, (long int)&debug_level,
-+ "debuglevel", get_int, (long int)&debug_level,
-+ "ForkFlag", get_flag, (long int)&fork_flag,
-+ "forkflag", get_flag, (long int)&fork_flag,
-
-- "PortName", get_str, (int)&port_name,
-- "portname", get_str, (int)&port_name,
-+ "PortName", get_str, (long int)&port_name,
-+ "portname", get_str, (long int)&port_name,
- #ifdef TLI
-- "PortNumber", get_str, (int)&port_number,
-- "portnumber", get_str, (int)&port_number,
-- "ProtoName", get_str, (int)&proto_name,
-- "protoname", get_str, (int)&proto_name,
-+ "PortNumber", get_str, (long int)&port_number,
-+ "portnumber", get_str, (long int)&port_number,
-+ "ProtoName", get_str, (long int)&proto_name,
-+ "protoname", get_str, (long int)&proto_name,
- #else
-- "PortNumber", get_int, (int)&port_number,
-- "portnumber", get_int, (int)&port_number,
-+ "PortNumber", get_int, (long int)&port_number,
-+ "portnumber", get_int, (long int)&port_number,
- #endif
-- "SocketName", get_str, (int)&socket_name,
-- "socketname", get_str, (int)&socket_name,
-+ "SocketName", get_str, (long int)&socket_name,
-+ "socketname", get_str, (long int)&socket_name,
- #ifdef LOCK_FILE
-- "LockFile", get_str, (int)&lock_file;
-- "lockfile", get_str, (int)&lock_file;
-+ "LockFile", get_str, (long int)&lock_file;
-+ "lockfile", get_str, (long int)&lock_file;
- #endif
-
-- "MaxClient", get_int, (int)&max_client,
-- "maxclient", get_int, (int)&max_client,
-- "DictDir", get_str, (int)&dict_dir,
-- "dictdir", get_str, (int)&dict_dir,
-- "ReadDict", get_list, (int)&read_dict,
-- "readdict", get_list, (int)&read_dict,
-- "OpenDict", get_list, (int)&open_dict,
-- "opendict", get_list, (int)&open_dict,
-- "ErrorOut", get_str, (int)&error_file,
-- "errorout", get_str, (int)&error_file,
-- "LogOut", get_str, (int)&log_file,
-- "logout", get_str, (int)&log_file,
-- "DirMode", get_int, (int)&dir_mode,
-- "dirmode", get_int, (int)&dir_mode,
-- "FileMode", get_int, (int)&file_mode,
-- "filemode", get_int, (int)&file_mode,
-- "AllowUser", get_list, (int)&allow_user,
-- "allowuser", get_list, (int)&allow_user,
-+ "MaxClient", get_int, (long int)&max_client,
-+ "maxclient", get_int, (long int)&max_client,
-+ "DictDir", get_str, (long int)&dict_dir,
-+ "dictdir", get_str, (long int)&dict_dir,
-+ "ReadDict", get_list, (long int)&read_dict,
-+ "readdict", get_list, (long int)&read_dict,
-+ "OpenDict", get_list, (long int)&open_dict,
-+ "opendict", get_list, (long int)&open_dict,
-+ "ErrorOut", get_str, (long int)&error_file,
-+ "errorout", get_str, (long int)&error_file,
-+ "LogOut", get_str, (long int)&log_file,
-+ "logout", get_str, (long int)&log_file,
-+ "DirMode", get_int, (long int)&dir_mode,
-+ "dirmode", get_int, (long int)&dir_mode,
-+ "FileMode", get_int, (long int)&file_mode,
-+ "filemode", get_int, (long int)&file_mode,
-+ "AllowUser", get_list, (long int)&allow_user,
-+ "allowuser", get_list, (long int)&allow_user,
- 0, 0, 0
- };
diff --git a/japanese/sj3-server/DESCR b/japanese/sj3-server/DESCR
deleted file mode 100644
index 3daaeb2d9b6..00000000000
--- a/japanese/sj3-server/DESCR
+++ /dev/null
@@ -1,20 +0,0 @@
-This is SJ3 2.0.1.20, a Japanese input method.
-This system developed by Sony Corporation.
-SJ3 is composed of Kana-Kanji conversion server(sj3serv),
-Kana-Kanji conversion client for terminal(sj3) and Kana-Kanji
-conversion library(sj3lib).
-
-If you start up sj3serv, you must add a following entry into
-/etc/services file or NIS/YP services map.
-
-sj3 3086/tcp
-
-This port number may be changed by the setup file(See manpages).
-
-This also include many patches for FreeBSD or others.
-(Remove warning, support pseudo-terminal of FreeBSD,
- some bug fix and change make rules.) If there are any problem
-in this patches, please know me via E-mail.
-
-Hidekazu Kuroki
-(hidekazu@cs.titech.ac.jp)
diff --git a/japanese/sj3-server/INSTALL b/japanese/sj3-server/INSTALL
deleted file mode 100644
index 41b27cf7274..00000000000
--- a/japanese/sj3-server/INSTALL
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-case $2 in
- POST-INSTALL)
- dic="${PKG_PREFIX}/libdata/sj3/dict/user"
- mkdir -p $dic
- chown ${SJ3OWNER}.${SJ3GROUP} $dic
- ;;
-esac
diff --git a/japanese/sj3-server/Makefile b/japanese/sj3-server/Makefile
deleted file mode 100644
index 6672657a2cc..00000000000
--- a/japanese/sj3-server/Makefile
+++ /dev/null
@@ -1,62 +0,0 @@
-# $NetBSD: Makefile,v 1.8 2002/02/28 13:29:46 wiz Exp $
-#
-
-DISTNAME= sj3-2.0.1.20
-PKGNAME= sj3-server-2.0.1.20
-CATEGORIES= japanese
-MASTER_SITES= ftp://ftp.sony.co.jp/pub/unsupported/src/ \
- ftp://ftp.cs.titech.ac.jp/pub/japanese/sj3/
-
-MAINTAINER= tech-pkg-ja@jp.netbsd.org
-COMMENT= Japanese input method (server)
-
-DEPENDS+= sj3-lib-2.0.1.20:../../japanese/sj3-lib
-
-FILESDIR= ${.CURDIR}/../../japanese/sj3-lib/files
-PATCHDIR= ${.CURDIR}/../../japanese/sj3-lib/patches
-
-.include "../../mk/bsd.prefs.mk"
-SJ3OWNER?= daemon
-SJ3GROUP?= daemon
-DICT_DIR?= /var/dict
-MAKE_ENV+= SJ3OWNER=${SJ3OWNER} SJ3GROUP=${SJ3GROUP} DICT_DIR=${DICT_DIR} \
- LOCAL_LDFLAGS="${LDFLAGS}"
-PLIST_SUBST= SJ3OWNER=${SJ3OWNER} SJ3GROUP=${SJ3GROUP} DICT_DIR=${DICT_DIR} \
- PREFIX=${PREFIX}
-
-INSTALL_SRC= ${PKGDIR}/INSTALL
-INSTALL_FILE= ${WRKDIR}/INSTALL
-
-STARTUP_SCRIPT= etc/rc.d/sj3
-STARTUP_SCRIPT_SRC=${WRKDIR}/STARTUP
-
-pre-configure:
- @${MV} ${WRKSRC}/Imakefile ${WRKSRC}/Imakefile.orig
- @${SED} -e 's|\(SUBDIRS = .*\)sj3lib \(.*\)|\1\2|' \
- ${WRKSRC}/Imakefile.orig > ${WRKSRC}/Imakefile
- @for file in `${FIND} ${WRKSRC} -name Imakefile`; do \
- ${MV} -f $$file $$file.orig; \
- ${SED} -e 's|\(= \).*/lib\(sj3lib\).a|\1-l\2|' \
- $$file.orig > $$file; \
- done
-
-do-configure:
- @(cd ${WRKSRC}; ${X11BASE}/bin/xmkmf; ${MAKE} Makefiles)
-
-post-build:
- @${ECHO} '#!/bin/sh' > ${STARTUP_SCRIPT_SRC}
- @${ECHO} 'sj3=${PREFIX}/bin/sj3serv' >> ${STARTUP_SCRIPT_SRC}
- @${ECHO} 'if [ -f $$sj3 ]; then' >> ${STARTUP_SCRIPT_SRC}
- @${ECHO} " echo -n ' sj3'" >> ${STARTUP_SCRIPT_SRC}
- @${ECHO} ' $$sj3' >> ${STARTUP_SCRIPT_SRC}
- @${ECHO} 'fi' >> ${STARTUP_SCRIPT_SRC}
- @${SED} -e 's|$${SJ3OWNER}|${SJ3OWNER}|' \
- -e 's|$${SJ3GROUP}|${SJ3GROUP}|' \
- -e 's|$${DICT_DIR}|${DICT_DIR}|' \
- -e 's|$${PREFIX}|${PREFIX}|' \
- ${INSTALL_SRC} > ${INSTALL_FILE}
-
-post-install:
- @${INSTALL_SCRIPT} ${STARTUP_SCRIPT_SRC} ${PREFIX}/${STARTUP_SCRIPT}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/japanese/sj3-server/PLIST b/japanese/sj3-server/PLIST
deleted file mode 100644
index cd04994951d..00000000000
--- a/japanese/sj3-server/PLIST
+++ /dev/null
@@ -1,33 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2002/02/15 10:12:45 skrll Exp $
-@cwd ${DICT_DIR}
-@cwd ${DICT_DIR}
-sj3/sj3main.dic
-@cwd ${PREFIX}
-bin/sj3
-bin/sj3dic
-bin/sj3mkdic
-bin/sj3serv
-bin/sj3stat
-etc/rc.d/sj3
-man/ja_JP.EUC/man1/sj3.1
-man/ja_JP.EUC/man1/sj3dic.1
-man/ja_JP.EUC/man1/sj3mkdic.1
-man/ja_JP.EUC/man1/sj3serv.1
-share/sj3/Nihongo.ps.Z
-share/sj3/cvtkey.news
-share/sj3/cvtkey.nwp511
-share/sj3/cvtkey.nwp517
-share/sj3/cvtkey.xterm
-share/sj3/hinsi.ms
-share/sj3/makedict.ms
-share/sj3/serverrc
-share/sj3/sj3lib.ms
-share/sj3/sj3serv.ms
-share/sj3/sjrc
-share/sj3/sjrk
-@dirrm share/sj3
-@exec ${MKDIR} ${DICT_DIR}/sj3/user
-@exec ${CHMOD} 755 ${DICT_DIR}/sj3/user
-@exec ${CHOWN} ${SJ3OWNER}:${SJ3GROUP} ${DICT_DIR}/sj3/user
-@unexec ${RMDIR} ${DICT_DIR}/sj3/user
-@unexec ${RMDIR} ${DICT_DIR}/sj3
diff --git a/japanese/sj3-server/distinfo b/japanese/sj3-server/distinfo
deleted file mode 100644
index be20a19c72b..00000000000
--- a/japanese/sj3-server/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.3 2001/05/07 18:13:13 dmcmahill Exp $
-
-SHA1 (sj3-2.0.1.20.tar.gz) = b1cae59065ebc9caf5e198143ceb9558c932f259
-Size (sj3-2.0.1.20.tar.gz) = 584065 bytes
-SHA1 (patch-aa) = e2c60ca8709f8b78833ebc4f506b4cc63812a5bd
-SHA1 (patch-ab) = a64f78ccb3db3f4349f191abe47c6daebb2bbadd
-SHA1 (patch-ac) = a2a9c21618e7de1e56d371cb05cf866d549d50a1
-SHA1 (patch-ad) = be015448eb4ee267a2228838cc2a08e2586b0a85
-SHA1 (patch-ae) = 3b07eb2ea9d72049a8f322220836a631598ea7dc
-SHA1 (patch-af) = 33ac72303dfa13929d423ecaf5d9b7cb308f8ff5
-SHA1 (patch-ag) = b01fda538eb70a8f66cd42bcc719e24da848929f
diff --git a/japanese/skkfep/DESCR b/japanese/skkfep/DESCR
deleted file mode 100644
index add0ec8cb03..00000000000
--- a/japanese/skkfep/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
- skkfep is a SKK-like Kana-to-Kanji FrontEnd Processor. It works
-on terminals and realizes SKK-like conversion without emacs.
-
-Features:
- - realize SKK-like Kana/Kanji user interface on terminals,
- - shares private and common dictionaries with SKK,
- - word registration is not currently supported.
diff --git a/japanese/skkfep/INSTALL b/japanese/skkfep/INSTALL
deleted file mode 100644
index 9b11982df9a..00000000000
--- a/japanese/skkfep/INSTALL
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /bin/sh
-# $NetBSD: INSTALL,v 1.1 2001/10/31 23:29:37 zuntum Exp $
-
-conf=@PKGBASE@/etc/skk.conf
-
-case "$2" in
-POST-INSTALL)
- # install skkserv port number
- if grep '^skkserv[ ]' /etc/services >/dev/null; then
- :
- else
- echo '
-skkserv 1178/tcp # SKK server' >>/etc/services
- fi
-
- # install skk.conf
- if [ -f $conf ] && grep -v -e '^#' -e '^$' $conf >/dev/null; then
- : file exists and it seems to have some configurations
- else
- cat <<'END' >$conf
-# skk.conf - configuration file for SKK client programs
-
-# Syntax
-# Lines start with '#' are comments.
-#
-# skkserv_host: <hostnme> # Host which skkserv is running on.
-# # default: localhost
-#
-# skkserv_port: <port> # TCP service name or port number of skkserv.
-# # default: skkserv
-#
-
-# skkserv_host: localhost
-# skkserv_port: skkserv
-# skkserv_port: 1178
-END
- fi
- ;;
-esac
diff --git a/japanese/skkfep/MESSAGE b/japanese/skkfep/MESSAGE
deleted file mode 100644
index dfb505d60b8..00000000000
--- a/japanese/skkfep/MESSAGE
+++ /dev/null
@@ -1,9 +0,0 @@
-======================================================================
-$NetBSD: MESSAGE,v 1.1 2001/10/31 23:29:37 zuntum Exp $
-
- To use skkfep, the dictionary server (skkserv) is almost
-required. Use "skkserv" pkg, or, if you have another machine
-running skkserv, put the hostname in ${LOCALBASE}/etc/skk.conf
-file, and skkfep will connect to the host.
-
-======================================================================
diff --git a/japanese/skkfep/Makefile b/japanese/skkfep/Makefile
deleted file mode 100644
index 82f633399eb..00000000000
--- a/japanese/skkfep/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2001/02/16 15:25:30 wiz Exp $
-
-DISTNAME= skkfep0.86c
-PKGNAME= skkfep-0.86c
-WRKSRC= ${WRKDIR}/skkfep
-CATEGORIES= japanese
-MASTER_SITES= ftp://ei5nazha.yz.yamagata-u.ac.jp/skkfep/
-
-MAINTAINER= packages@netbsd.org
-HOMEPAGE= http://ei5nazha.yz.yamagata-u.ac.jp/~aito/aito-soft.html
-COMMENT= Terminal based SKK-like Kana-to-Kanji FrontEnd Processor
-
-BUILD_DEFS+= USE_INET6
-
-NO_CONFIGURE=
-MAKE_ENV= MAKE_FLAGS='EXECBASE=${LOCALBASE} CC=${CC}'
-
-DESCR_SRC= ${WRKDIR}/DESCR
-INSTALL_FILE= ${WRKDIR}/INSTALL
-
-post-build:
- ${SED} 's#@PKGBASE@#${LOCALBASE}#g' ${PKGDIR}/DESCR >${DESCR_SRC}
- ${SED} 's#@PKGBASE@#${LOCALBASE}#g' ${PKGDIR}/INSTALL >${INSTALL_FILE}
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/skkfep ${PREFIX}/bin/skkfep
- ${INSTALL_MAN} ${WRKSRC}/skkfep.1 ${PREFIX}/man/man1/skkfep.1
- ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/japanese/skkfep/PLIST b/japanese/skkfep/PLIST
deleted file mode 100644
index 3a9eee86f9d..00000000000
--- a/japanese/skkfep/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:29:37 zuntum Exp $
-bin/skkfep
-man/man1/skkfep.1
-@unexec if [ -f %D/etc/skk.conf ]; then echo 'Remove "%D/etc/skk.conf" if you will not use SKK programs any longer.'; fi
diff --git a/japanese/skkfep/distinfo b/japanese/skkfep/distinfo
deleted file mode 100644
index 3ee21cdb197..00000000000
--- a/japanese/skkfep/distinfo
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 10:13:37 wiz Exp $
-
-SHA1 (skkfep0.86c.tar.gz) = fe1473c2a9d28901a96fdc5cf51079de47c86c32
-Size (skkfep0.86c.tar.gz) = 46748 bytes
-SHA1 (patch-aa) = 67464f423931e62c17c7118e9acb0c33c56d81b1
-SHA1 (patch-ab) = f913b929b6857bf29b2936edde6c87d9d17c4309
-SHA1 (patch-ac) = a55de012abb00d22a9a209c265b72a508c333d47
-SHA1 (patch-ba) = 4c3d43e8424a1218e4b638dde49e16023ee2d96a
-SHA1 (patch-bb) = 9eb7fb317c661ebc293fdf02d2128b31a465c4ab
-SHA1 (patch-bc) = c832e04eceeab71b9add976082c9375bd8a9dc03
-SHA1 (patch-bd) = 8e3321de9841382f932bb9edf1470d1cbe455bce
-SHA1 (patch-be) = 10aa4c7002b224f80e8af540012f76a661cec92d
-SHA1 (patch-bf) = c8e76e009fee4ad6f86bf70c71c0bc51dc596174
-SHA1 (patch-bg) = b1159a569233280cc1ad9df2da0189fd3a2d08ad
diff --git a/japanese/skkfep/patches/patch-aa b/japanese/skkfep/patches/patch-aa
deleted file mode 100644
index c7a5238246b..00000000000
--- a/japanese/skkfep/patches/patch-aa
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/12/24 03:21:10 itohy Exp $
-
---- config.h.orig Tue Sep 22 01:45:27 1998
-+++ config.h Tue Dec 21 00:09:13 1999
-@@ -2,10 +2,24 @@
- * Configuration for SKKFEP
- */
-
--#include "configs/solaris2.h"
-+#ifdef sun
-+# ifdef __SVR4
-+# include "configs/solaris2.h"
-+# undef TERMINFO
-+# else
-+# include "configs/sun.h"
-+# endif
-+#elif defined(__NetBSD__)
-+#include "configs/netbsd.h"
-+#elif defined(__FreeBSD__)
-+#include "configs/freebsd.h"
-+#elif defined(__bsdi__)
-+#include "configs/bsdi.h"
-+#elif defined(__linux__)
-+#include "configs/linux.h"
-+#endif
-
- #if makefile_parameter
--CC=gcc
- DEFINE=-DUSE_LOCALE
- OPTIMIZE=-O
- EXTRALIBS=
-@@ -14,7 +28,7 @@
- #define DEFAULT_KANAKEY "^j"
-
- /* By Y. Kaneko */
--/*#define KUTOUTEN /* "."->maru, ","->ten */
-+#define KUTOUTEN /* "."->maru, ","->ten */
-
- #define KANJIBS /* do/don't shuft-out BS code in JIS mode */
- #define KANJIBS_DEFAULT 0 /* 0 -> shift out / 1 -> don't shift out */
-@@ -28,4 +42,4 @@
-
- #define NATIVECODE euc /* EUC Kanji code */
-
--#define SKK_SERVER_HOST "ei5nazha" /* SKK server host */
-+#define SKK_SERVER_HOST "localhost" /* SKK server host */
diff --git a/japanese/skkfep/patches/patch-ab b/japanese/skkfep/patches/patch-ab
deleted file mode 100644
index 22d3bb4f108..00000000000
--- a/japanese/skkfep/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 1999/12/24 03:21:10 itohy Exp $
-
---- configs/netbsd.h.orig Tue Jul 7 00:31:13 1998
-+++ configs/netbsd.h Mon Dec 20 23:53:25 1999
-@@ -1,5 +1,5 @@
- /*
-- * Configuration for NetBSD-1.2 (x68k)
-+ * Configuration for NetBSD
- */
-
- #define BSD /* My machine is BSD system */
-@@ -8,7 +8,9 @@
- #define HAVE_SETENV /* My machine has setenv() */
- #define HAVE_BSD_OPENPTY /* BSD type openpty() */
-
--#include <stdlib.h> /* just in case of NetBSD/Alpha */
-+#include <stdlib.h>
-+#include <string.h>
-+#include <unistd.h>
- #include <util.h> /* for openpty() */
-
- #if makefile_parameter
diff --git a/japanese/skkfep/patches/patch-ac b/japanese/skkfep/patches/patch-ac
deleted file mode 100644
index 176be3f12c0..00000000000
--- a/japanese/skkfep/patches/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 1999/12/24 03:21:10 itohy Exp $
-
---- Makefile.orig Tue Jul 7 00:31:14 1998
-+++ Makefile Mon Dec 20 23:45:52 1999
-@@ -15,5 +15,8 @@
- rm -f genMakefile
-
- genMakefile: protoMakefile config.h
-- awk -f extrpar `grep 'configs/.*\.h' config.h | sed 's/.*\(configs\/.*\.h\).*/\1/'` > genMakefile
-+ rm -f genMakefile
-+ cp config.h junk.c
-+ awk -f extrpar `cc -E junk.c | sed -n 's/^#[^"]*"\([^/][^"]*onfigs[^"]*\)".*/\1/p' | sort | uniq` > genMakefile
-+ rm -f junk.c
- awk -f extrpar config.h | cat - protoMakefile >> genMakefile
diff --git a/japanese/skkfep/patches/patch-ba b/japanese/skkfep/patches/patch-ba
deleted file mode 100644
index 43c17ea2e9e..00000000000
--- a/japanese/skkfep/patches/patch-ba
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ba,v 1.1.1.1 1999/12/24 03:21:10 itohy Exp $
-
---- protoMakefile.orig Tue Jul 7 00:31:15 1998
-+++ protoMakefile Mon Dec 20 23:49:42 1999
-@@ -1,4 +1,5 @@
--CFLAGS=$(SYSINCLUDE) $(SYSDEFINE) $(DEFINE) $(OPTIMIZE)
-+CFLAGS=$(SYSINCLUDE) $(SYSDEFINE) $(DEFINE) $(OPTIMIZE) \
-+ -DSKK_CONF=\"$(EXECBASE)/etc/skk.conf\"
- LIBS =$(SYSLIBS) $(EXTRALIBS) -ltermcap
-
- OBJS=fep.o connsh.o readwrite.o terms.o stty.o keybind.o romkan.o etc.o\
diff --git a/japanese/skkfep/patches/patch-bb b/japanese/skkfep/patches/patch-bb
deleted file mode 100644
index 870991b5ac0..00000000000
--- a/japanese/skkfep/patches/patch-bb
+++ /dev/null
@@ -1,146 +0,0 @@
-$NetBSD: patch-bb,v 1.2 2000/11/09 03:53:31 itohy Exp $
-
---- connserv.c.orig Tue Jul 7 00:31:16 1998
-+++ connserv.c Tue Nov 7 20:58:57 2000
-@@ -14,6 +14,10 @@
- #include <netinet/in.h>
- #include <netdb.h>
-
-+#ifdef PF_INET6
-+# define HAVE_GETADDRINFO
-+#endif
-+
- #define SKK_PORT_NUMBER 1178
- #define SKK_SERVICENAME "skkserv"
-
-@@ -36,50 +40,112 @@
- int sock;
- int i;
- unsigned short port;
-+#ifdef HAVE_GETADDRINFO
-+ struct addrinfo aihint, *ai0, *ai;
-+ int error;
-+#else
- struct sockaddr_in hostaddr;
- struct hostent *entry;
- struct servent *serv;
- struct protoent *proto;
-- int a1,a2,a3,a4;
-+#endif
- char *hostname;
--
-- serv = getservbyname(SKK_SERVICENAME,"tcp");
-- fillzero((char*)&hostaddr,sizeof(struct sockaddr_in));
-- if ((proto = getprotobyname("tcp")) == NULL) {
-- return -1;
-- }
--
-- if ((sock = socket(AF_INET,SOCK_STREAM,proto->p_proto)) < 0) {
-- return -1;
-+#ifdef SKK_CONF /* use skk.conf */
-+ FILE *conffp;
-+ char line[128];
-+ char hostbuf[128];
-+ char servbuf[128];
-+ char *confhost = NULL;
-+ char *confport = SKK_SERVICENAME;
-+
-+ if ((conffp = fopen(SKK_CONF, "r")) != NULL) {
-+ char *p, *data;
-+
-+ while (fgets(line, sizeof line, conffp) != NULL) {
-+ if ((p = strchr(line, '#')) != NULL)
-+ *p = '\0';
-+ if ((p = strtok(line, ": \t\n")) == NULL)
-+ continue;
-+ if ((data = strtok((char *) NULL, " \t\n")) == NULL)
-+ continue;
-+ if (!strcmp(p, "skkserv_host")) {
-+ strcpy(hostbuf, data);
-+ confhost = hostbuf;
-+ } else if (!strcmp(p, "skkserv_port")) {
-+ strcpy(servbuf, data);
-+ confport = servbuf;
-+ }
-+ }
- }
-+# undef SKK_SERVICENAME
-+# define SKK_SERVICENAME confport
-+#endif
-
- if (SKKServerHost)
- hostname = SKKServerHost;
- else if ((hostname = getenv("SKKSERVER")) == NULL) {
-+#ifdef SKK_CONF
-+ if ((hostname = confhost) == NULL)
-+#endif
- #ifdef SKK_SERVER_HOST
- hostname = SKK_SERVER_HOST;
- #else
- return -1;
- #endif
- }
-- if ('0' <= *hostname && *hostname <= '9') {
-- if (sscanf(hostname,"%d.%d.%d.%d",&a1,&a2,&a3,&a4) != 4) {
-- return -1;
-- }
-- a1 = (a1<<24)|(a2<<16)|(a3<<8)|a4;
-- hostaddr.sin_addr.s_addr = htonl(a1);
-+
-+#ifdef HAVE_GETADDRINFO
-+ fillzero((char*)&aihint, sizeof aihint);
-+ aihint.ai_family = PF_UNSPEC;
-+ aihint.ai_socktype = SOCK_STREAM;
-+ aihint.ai_flags = AI_CANONNAME;
-+ error = getaddrinfo(hostname, SKK_SERVICENAME, &aihint, &ai0);
-+ if (error) {
-+ printf("%s: %s\r\n", gai_strerror(error), hostname);
-+ return -1;
-+ }
-+
-+ sock = -1;
-+ for (ai = ai0; ai; ai = ai->ai_next) {
-+ sock = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
-+ if (sock >= 0 &&
-+ connect(sock, ai->ai_addr, ai->ai_addrlen) == 0)
-+ break;
-+ close(sock);
-+ sock = -1;
-+ }
-+ if (sock < 0) {
-+ perror(hostname);
-+ return -1;
-+ }
-+#else
-+ serv = getservbyname(SKK_SERVICENAME,"tcp");
-+ fillzero((char*)&hostaddr,sizeof(struct sockaddr_in));
-+ if ((proto = getprotobyname("tcp")) == NULL) {
-+ return -1;
- }
-- else {
-+
-+ if ((sock = socket(AF_INET,SOCK_STREAM,proto->p_proto)) < 0) {
-+ return -1;
-+ }
-+
-+ if ((hostaddr.sin_addr.s_addr = inet_addr(hostname)) == INADDR_NONE) {
- if ((entry = gethostbyname(hostname)) == NULL) {
- return -1;
- }
- bincopy(entry->h_addr, &hostaddr.sin_addr, entry->h_length);
- }
- hostaddr.sin_family = AF_INET;
-- hostaddr.sin_port = serv ? serv->s_port : htons(SKK_PORT_NUMBER);
-+ hostaddr.sin_port =
-+ serv ? serv->s_port :
-+#ifdef SKK_CONF
-+ (i = atoi(confport)) > 0 ? htons(i) :
-+#endif
-+ htons(SKK_PORT_NUMBER);
- if (connect(sock,(struct sockaddr *)&hostaddr,sizeof(struct sockaddr_in)) < 0) {
- return -1;
- }
-+#endif
- printf("SKKSERVER=%s\r\n",hostname);
- skkservsock = sock;
- rserv = fdopen(sock,"r");
diff --git a/japanese/skkfep/patches/patch-bc b/japanese/skkfep/patches/patch-bc
deleted file mode 100644
index 64046866552..00000000000
--- a/japanese/skkfep/patches/patch-bc
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-bc,v 1.1.1.1 1999/12/24 03:21:10 itohy Exp $
-
---- connsh.c.orig Tue Sep 22 01:50:12 1998
-+++ connsh.c Sun Sep 27 13:41:53 1998
-@@ -21,6 +21,10 @@
- #define vfork fork
- #endif
-
-+#ifdef USE_SERVER
-+extern int skkservsock;
-+#endif
-+
- #define DEVICELEN 16
- #define DEFAULT_SHELL "/bin/csh"
-
-@@ -171,8 +175,9 @@
- #endif /* not HPUX */
-
- if((i = vfork()) < 0) {
-- fprintf(stderr,"fork error\n");
-- abort();
-+ perror("fork");
-+ reset_tty();
-+ Exit(1);
- }
-
- if(i == 0) { /* child */
-@@ -226,6 +231,10 @@
- dup2(slave,1);
- dup2(slave,2);
- close(slave);
-+#ifdef USE_SERVER
-+ if (skkservsock >= 0)
-+ close(skkservsock);
-+#endif
-
- seteuid(getuid());
- p = &ShellName[strlen(ShellName)];
diff --git a/japanese/skkfep/patches/patch-bd b/japanese/skkfep/patches/patch-bd
deleted file mode 100644
index 2dc1a44d40a..00000000000
--- a/japanese/skkfep/patches/patch-bd
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-bd,v 1.1.1.1 1999/12/24 03:21:10 itohy Exp $
-
---- fep.c.orig Tue Jul 7 00:31:16 1998
-+++ fep.c Tue Dec 21 00:42:53 1999
-@@ -219,7 +219,6 @@
- /* Initialize */
- setKanaKey();
- getTCstr();
-- tty_ready();
- get_winsize();
- set_tty();
- set_int();
-@@ -308,7 +307,7 @@
- break;
- }
- }
-- return jisAJ; /* default */
-+ return jisBB; /* default */
- }
-
- flushOut(minchar)
diff --git a/japanese/skkfep/patches/patch-be b/japanese/skkfep/patches/patch-be
deleted file mode 100644
index af11be77efc..00000000000
--- a/japanese/skkfep/patches/patch-be
+++ /dev/null
@@ -1,66 +0,0 @@
-$NetBSD: patch-be,v 1.1.1.1 1999/12/24 03:21:10 itohy Exp $
-
---- readwrite.c.orig Tue Jul 7 00:31:15 1998
-+++ readwrite.c Sun Sep 27 10:24:06 1998
-@@ -4,6 +4,14 @@
- #include "kanjicode.h"
- #include "ctrlcode.h"
-
-+#ifndef STDIN_FILENO
-+#define STDIN_FILENO 0
-+#endif
-+
-+#ifndef STDOUT_FILENO
-+#define STDOUT_FILENO 1
-+#endif
-+
- #ifdef DEBUG
- extern FILE *wrlog;
- #endif
-@@ -29,12 +37,10 @@
- SIC_B,SOC_B,"JIS",3,3,
- };
-
--extern int tty;
--
- char read1()
- { char c;
-
-- if (read(tty,&c,1) != 0)
-+ if (read(STDIN_FILENO,&c,1) != 0)
- return c;
- return EOF;
- }
-@@ -320,13 +326,13 @@
- char *s;
- { int l = strlen(s);
-
-- writeTTYorg(tty,s,l,INTERNALCODE,OutCode,&TInter_Stat,&To_TTY_Stat);
-+ writeTTYorg(STDOUT_FILENO,s,l,INTERNALCODE,OutCode,&TInter_Stat,&To_TTY_Stat);
- }
-
- write1(c)
- char c;
- {
-- writeTTYorg(tty,&c,1,INTERNALCODE,OutCode,&TInter_Stat,&To_TTY_Stat);
-+ writeTTYorg(STDOUT_FILENO,&c,1,INTERNALCODE,OutCode,&TInter_Stat,&To_TTY_Stat);
- }
-
- writeShTty(s,l)
-@@ -334,14 +340,14 @@
- int l;
- {
-
-- writeTTYorg(tty,s,l,WriteCode,OutCode,&From_SH_Stat,&To_TTY_Stat);
-+ writeTTYorg(STDOUT_FILENO,s,l,WriteCode,OutCode,&From_SH_Stat,&To_TTY_Stat);
- }
-
- writeTty(s,l)
- char *s;
- int l;
- {
-- writeTTYorg(tty,s,l,INTERNALCODE,OutCode,&TInter_Stat,&To_TTY_Stat);
-+ writeTTYorg(STDOUT_FILENO,s,l,INTERNALCODE,OutCode,&TInter_Stat,&To_TTY_Stat);
- }
-
-
diff --git a/japanese/skkfep/patches/patch-bf b/japanese/skkfep/patches/patch-bf
deleted file mode 100644
index 113477e8d80..00000000000
--- a/japanese/skkfep/patches/patch-bf
+++ /dev/null
@@ -1,104 +0,0 @@
-$NetBSD: patch-bf,v 1.1.1.1 1999/12/24 03:21:10 itohy Exp $
-
---- stty.c.orig Wed Sep 23 01:22:53 1998
-+++ stty.c Sun Sep 27 10:21:12 1998
-@@ -31,12 +31,15 @@
-
- #endif
-
-+#ifndef STDIN_FILENO
-+#define STDIN_FILENO 0
-+#endif
-+
- #ifndef NO_SUSPEND
- SignalFunc suspend();
- #endif
-
- TERMPARAM d_ioval;
--int tty;
- #ifdef TIOCSWINSZ
- struct winsize d_winsize;
- #endif /* TIOCSWINSZ */
-@@ -142,7 +145,7 @@
- #ifdef TIOCSWINSZ
- extern int lines, columns;
-
-- ioctl(tty, TIOCGWINSZ, &d_winsize);
-+ ioctl(STDIN_FILENO, TIOCGWINSZ, &d_winsize);
- if (d_winsize.ws_col == 0) {
- d_winsize.ws_col = columns;
- } else {
-@@ -153,7 +156,7 @@
- } else {
- lines = d_winsize.ws_row;
- }
-- ioctl(tty, TIOCSWINSZ, &d_winsize);
-+ ioctl(STDIN_FILENO, TIOCSWINSZ, &d_winsize);
- #endif /* TIOCSWINSZ */
- }
-
-@@ -161,7 +164,7 @@
- { int er;
- TERMPARAM ioval;
-
-- GET_TTY(tty, &d_ioval);
-+ GET_TTY(STDIN_FILENO, &d_ioval);
- ioval = d_ioval;
-
- #if defined TERMIOS || defined TERMIO
-@@ -195,7 +198,7 @@
- ioval.m_ttyb.sg_flags = RAW;
- #endif
-
-- er = SET_TTY(tty, &ioval);
-+ er = SET_TTY(STDIN_FILENO, &ioval);
-
- initFep();
-
-@@ -208,14 +211,8 @@
-
- reset_tty()
- {
-- reset_tty_without_close();
-- close(tty);
--}
--
--reset_tty_without_close()
--{
- termFep();
-- SET_TTY(tty, &d_ioval);
-+ SET_TTY(STDIN_FILENO, &d_ioval);
- }
-
- set_tty_sane(tty)
-@@ -258,12 +255,6 @@
- }
- }
-
--tty_ready()
--{ char *ttyname();
--
-- tty = open(ttyname(0),O_RDWR);
--}
--
- SignalFunc
- reset_exit()
- {
-@@ -315,7 +306,7 @@
- union wait statusp;
- #endif
-
--#ifndef NO_SUSPEND
-+#ifdef NO_SUSPEND
- while ((cpid = wait((int *)&statusp)) != -1 && cpid != ShellPID)
- ;
- #else
-@@ -385,7 +376,7 @@
- SignalFunc
- suspend()
- {
-- reset_tty_without_close();
-+ reset_tty();
- signal(SIGTSTP,SIG_DFL);
- kill(0,SIGTSTP);
-
diff --git a/japanese/skkfep/patches/patch-bg b/japanese/skkfep/patches/patch-bg
deleted file mode 100644
index 225b441b59a..00000000000
--- a/japanese/skkfep/patches/patch-bg
+++ /dev/null
@@ -1,70 +0,0 @@
-$NetBSD: patch-bg,v 1.2 1999/12/26 23:13:36 itohy Exp $
-
---- skkfep.1.orig Tue Jul 7 00:31:16 1998
-+++ skkfep.1 Sat Dec 25 17:28:26 1999
-@@ -21,12 +21,13 @@
- EUC (or DEC code).
- .IP \fBsj\fR
- MS-Kanji (Shift-JIS) code.
--.IP \fBjis\fIIO\fR
-+.IP \fBjis\fIIO\fR
- JIS code. \fII\fR and \fIO\fR are characters which
--represent shift-in/out escape sequence respectively. For shift-in,
--\fBA,@\fR(ESC $ @) or \fBB\fR(ESC $ B) can be specified; for
--shift-out, \fBH\fR(ESC ( H), \fBJ\fR(ESC ( J) or \fBB\fR(ESC ( B) can
-+represent kanji/ASCII escape sequences respectively. For kanji sequence,
-+\fBA\fR, \fB@\fR (ESC $ @) or \fBB\fR (ESC $ B) can be specified; for
-+ASCII sequence, \fBH\fR (ESC ( H), \fBJ\fR (ESC ( J) or \fBB\fR (ESC ( B) can
- be specified.
-+If the \fIIO\fR characters are omitted, the characters default to \fBBB\fR.
- .RE
- .TP
- .BI -f kanjicode
-@@ -34,7 +35,7 @@
- .TP
- .BI -udic \0dictionary
- Specifies the user dictionary file.
--Default is $(HOME)/.skk-jisyo.
-+Default is $HOME/.skk-jisyo.
- .TP
- .B -bs
- Toggle BS behavior when the
-@@ -46,12 +47,12 @@
- Choose the mode of learning words got from skk server.
- \fImode\fR is one of following:
- .RS
--.IP \fBnone\fR or \fBoff\fR or \fB0\fR
-+.IP "\fBnone\fR or \fBoff\fR or \fB0\fR"
- Do not learn the words at all.
--.IP \fBtemporal\fR or \fB1\fR
-+.IP "\fBtemporal\fR or \fB1\fR"
- Learn the words while the skkfep process is alive, but do not record
- the learned information.
--.IP \fBpermanent\fR or \fB2\fR
-+.IP "\fBpermanent\fR or \fB2\fR"
- Learn the words and record them on the user dictionary.
- .RE
- .TP
-@@ -61,12 +62,20 @@
- .TP
- .BI -k char
- Specify the kanji toggle key. A control character is
--expressed as ^ followed by an alphabet (for example, ^t). Default is
--^T.
-+expressed as ^ followed by an alphabet (for example, ^j). Default is
-+^J.
- .TP
- .B -esc
- With this option, ESC key becomes `RETUEN-TO-SKK-MODE' key.
- This option is useful for vi-users.
-+.TP
-+.B -viesc
-+With this option, ESC key becomes `RETUEN-TO-SKK-MODE' key and
-+one of i, a, o, I, A, S, and R key restores the last mode.
-+.TP
-+.B -emacsesc
-+With this option, control characters go though to the shell and disable
-+conversion temporarily.
- .TP
- .B -rs
- Reverse status line.
diff --git a/japanese/skkinput/DESCR b/japanese/skkinput/DESCR
deleted file mode 100644
index 6e37b3af95b..00000000000
--- a/japanese/skkinput/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
- skkinput is an X11 frontend of SKK (Simple Kana to Kanji conversion).
-It behaves as a kana-kanji conversion server of kinput, kinput2, and Ximp
-protocols and X11R6 X Input Method. It makes use of skkserv to access
-the common dictionary.
diff --git a/japanese/skkinput/INSTALL b/japanese/skkinput/INSTALL
deleted file mode 100644
index 4bfd53965e1..00000000000
--- a/japanese/skkinput/INSTALL
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /bin/sh
-# $NetBSD: INSTALL,v 1.1 2001/10/31 23:29:38 zuntum Exp $
-
-conf=@PKGBASE@/etc/skk.conf
-
-case "$2" in
-POST-INSTALL)
- # install skkserv port number
- if grep '^skkserv[ ]' /etc/services >/dev/null; then
- :
- else
- echo '
-skkserv 1178/tcp # SKK server' >>/etc/services
- fi
-
- # install skk.conf
- if [ -f $conf ] && grep -v -e '^#' -e '^$' $conf >/dev/null; then
- : file exists and it seems to have some configurations
- else
- cat <<'END' >$conf
-# skk.conf - configuration file for SKK client programs
-
-# Syntax
-# Lines start with '#' are comments.
-#
-# skkserv_host: <hostnme> # Host which skkserv is running on.
-# # default: localhost
-#
-# skkserv_port: <port> # TCP service name or port number of skkserv.
-# # default: skkserv
-#
-
-# skkserv_host: localhost
-# skkserv_port: skkserv
-# skkserv_port: 1178
-END
- fi
- ;;
-esac
diff --git a/japanese/skkinput/MESSAGE b/japanese/skkinput/MESSAGE
deleted file mode 100644
index e9acf8fbb13..00000000000
--- a/japanese/skkinput/MESSAGE
+++ /dev/null
@@ -1,9 +0,0 @@
-======================================================================
-$NetBSD: MESSAGE,v 1.1 2001/10/31 23:29:38 zuntum Exp $
-
- To use skkinput, the dictionary server (skkserv) is almost
-required. Use "skkserv" pkg, or, if you have another machine
-running skkserv, put the hostname in ${LOCALBASE}/etc/skk.conf
-file, and skkinput will connect to the host.
-
-======================================================================
diff --git a/japanese/skkinput/Makefile b/japanese/skkinput/Makefile
deleted file mode 100644
index 6f3da0af027..00000000000
--- a/japanese/skkinput/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2001/02/25 04:17:54 hubertf Exp $
-
-DISTNAME= skkinput-2.03
-CATEGORIES= japanese
-MASTER_SITES= http://member.nifty.ne.jp/Tatari_SAKAMOTO/
-
-MAINTAINER= packages@netbsd.org
-HOMEPAGE= http://www.yajima.kuis.kyoto-u.ac.jp/staffs/sakamoto/skkinput/skkinput.html
-COMMENT= X11 frontend for SKK
-
-BUILD_DEFS+= USE_INET6
-
-USE_IMAKE= YES
-
-# skk.conf uses /usr/pkg (${LOCALBASE}), not /usr/X11R6 (${PREFIX})
-MAKE_ENV= MAKE_FLAGS='EXECBASE=${LOCALBASE}'
-PLIST_SUBST= PKGBASE=${LOCALBASE}
-
-DESCR_SRC= ${WRKDIR}/DESCR
-INSTALL_FILE= ${WRKDIR}/INSTALL
-
-post-build:
- ${SED} 's#@PKGBASE@#${LOCALBASE}#g' ${PKGDIR}/DESCR >${DESCR_SRC}
- ${SED} 's#@PKGBASE@#${LOCALBASE}#g' ${PKGDIR}/INSTALL >${INSTALL_FILE}
-
-post-install:
- ${INSTALL_MAN} ${WRKSRC}/skkinput.man ${PREFIX}/man/ja_JP.EUC/man1/skkinput.1
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/skkinput
- ${INSTALL_DATA} ${WRKSRC}/README.jis ${PREFIX}/share/doc/skkinput
- ${INSTALL_DATA} ${WRKSRC}/FAQ.jis ${PREFIX}/share/doc/skkinput
- ${INSTALL_DATA} ${WRKSRC}/BUGS.jis ${PREFIX}/share/doc/skkinput
- ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/japanese/skkinput/PLIST b/japanese/skkinput/PLIST
deleted file mode 100644
index 1be17cd69fb..00000000000
--- a/japanese/skkinput/PLIST
+++ /dev/null
@@ -1,9 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:29:38 zuntum Exp $
-bin/skkinput
-lib/X11/app-defaults/Skkinput
-man/ja_JP.EUC/man1/skkinput.1
-share/doc/skkinput/README.jis
-share/doc/skkinput/FAQ.jis
-share/doc/skkinput/BUGS.jis
-@dirrm share/doc/skkinput
-@unexec if [ -f ${PKGBASE}/etc/skk.conf ]; then echo 'Remove "${PKGBASE}/etc/skk.conf" if you will not use SKK programs any longer.'; fi
diff --git a/japanese/skkinput/distinfo b/japanese/skkinput/distinfo
deleted file mode 100644
index 9a783526c6a..00000000000
--- a/japanese/skkinput/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 10:13:37 wiz Exp $
-
-SHA1 (skkinput-2.03.tar.gz) = d36af4f0c28ce86baee658560e36566885fbe2da
-Size (skkinput-2.03.tar.gz) = 398821 bytes
-SHA1 (patch-aa) = 662b5d54615745fa2bad9d662f9db88009df5d4e
-SHA1 (patch-ab) = 205a6fed61467f188abecfa559d3405832fe07a8
-SHA1 (patch-ac) = 77a06d8827e048c735543cae75ce6116b1318264
-SHA1 (patch-ad) = 1c5597d2fa41a00ce662eec5b8944dd823b4b8fd
-SHA1 (patch-ae) = 1cf9ea8cb4bf29ffcdb8d5ad5b2b6d74b6e0eca5
diff --git a/japanese/skkinput/patches/patch-aa b/japanese/skkinput/patches/patch-aa
deleted file mode 100644
index af0e3c2a86e..00000000000
--- a/japanese/skkinput/patches/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/12/24 03:23:50 itohy Exp $
-
---- Imakefile.orig Tue Mar 3 21:59:39 1998
-+++ Imakefile Tue Dec 21 01:29:48 1999
-@@ -81,7 +81,8 @@
- OBJS = $(COMMONOBJS) $(KINPUTOBJS) $(XIMPOBJS) $(IMOBJS)
-
- #ifdef SkkServer
--SKKSERVER_DEFS = -DDEFAULT_SKKSERVER=\"SkkServer\"
-+SKKSERVER_DEFS = -DDEFAULT_SKKSERVER=\"SkkServer\" \
-+ -DSKK_CONF=\"$(EXECBASE)/etc/skk.conf\"
- #endif
-
- #ifdef SkkPort
-@@ -95,5 +96,5 @@
- DEFINES = $(SKKSERVER_DEFS) $(SKKPORT_DEFS) $(SKK_DEBUGFLAGS) \
- $(SKKFONT_DEFS) $(SKK_KINPUTDEFS) $(SKK_XIMPDEFS) $(SKK_IMDEFS)
-
--ComplexProgramTarget(skkinput)
-+ComplexProgramTargetNoMan(skkinput)
- InstallAppDefaults(Skkinput)
diff --git a/japanese/skkinput/patches/patch-ab b/japanese/skkinput/patches/patch-ab
deleted file mode 100644
index 2174768295d..00000000000
--- a/japanese/skkinput/patches/patch-ab
+++ /dev/null
@@ -1,103 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2000/11/09 03:54:07 itohy Exp $
-
---- skkconfig.c.orig Thu Nov 13 22:42:43 1997
-+++ skkconfig.c Thu Nov 9 00:19:40 2000
-@@ -100,6 +100,7 @@
- * skkinput ¤ÎÆ°ºî¤ò·èÄꤹ¤ëÊÑ¿ô·²¡£
- */
- extern int skkserv_portnum ;
-+extern char *skkserv_portstr ;
- extern char *skkserv_host ;
- extern char *skkinput_local_jisyo_name ;
- extern char *skkinput_backup_jisyo_name ;
-@@ -980,6 +981,21 @@
- return ;
- }
-
-+#ifdef SKK_CONF
-+char *
-+strsave(const char *str)
-+{
-+ char *p;
-+
-+ if ((p = malloc(strlen(str) + 1)) == NULL) {
-+ fprintf(stderr, "Fatal: Memory Exhausted.\n");
-+ exit(1);
-+ }
-+ strcpy(p, str);
-+ return p;
-+}
-+#endif
-+
- /*
- * skkinput ¤ÎÆ°ºîµ­½Ò¤ò¤¹¤ëÊÑ¿ô¤ò½é´ü²½¤¹¤ë´Ø¿ô¡£
- *------
-@@ -987,30 +1003,54 @@
- */
- void initSkkinputDousaketteiVariables( void )
- {
-- struct servent *servent ;
-+#ifdef SKK_CONF /* use skk.conf */
-+ FILE *conffp;
-+ char line[128];
-+ char hostbuf[128];
-+ char servbuf[128];
-+ char *confhost = NULL;
-+ char *confport = NULL;
-+
-+ if ((conffp = fopen(SKK_CONF, "r")) != NULL) {
-+ char *p, *data;
-+
-+ while (fgets(line, sizeof line, conffp) != NULL) {
-+ if ((p = strchr(line, '#')) != NULL)
-+ *p = '\0';
-+ if ((p = strtok(line, ": \t\n")) == NULL)
-+ continue;
-+ if ((data = strtok((char *) NULL, " \t\n")) == NULL)
-+ continue;
-+ if (!strcmp(p, "skkserv_host")) {
-+ strcpy(hostbuf, data);
-+ confhost = hostbuf;
-+ } else if (!strcmp(p, "skkserv_port")) {
-+ strcpy(servbuf, data);
-+ confport = servbuf;
-+ }
-+ }
-+ }
-+#endif
-
- /* ¶É½ê¼­½ñ¤Î½êºß¤òÃΤé¤Ê¤¤¤È¤·¤Æ¤ª¤¯¡£*/
- skkinput_local_jisyo_name = DEFAULT_SKKLJISYO ;
- skkinput_backup_jisyo_name = DEFAULT_SKKBJISYO ;
- skkinput_record_name = DEFAULT_SKKRECORD ;
- skk_local_jisyo_name = DEFAULT_SKKLOCALJISYO ;
-- /* "/etc/services" ¤«¤é¥Ý¡¼¥ÈÈÖ¹æ¤òÆÀ¤Æ¤ª¤¯¡£*/
-- servent = getservbyname( SKKSERV_SERVICE_NAME, SKKSERV_SERVICE_PROTO ) ;
-- if( servent == NULL ){
-- /* /etc/services ¤ËÀßÄê¤Ï¤Ê¤«¤Ã¤¿¤Î¤Ç¡¢config.h ¤ÎÃæ¤Î¤ò»È¤¦¡£*/
-- skkserv_portnum = atoi( DEFAULT_SKKPORT ) ;
-- } else {
-- /* /etc/services ¤ËÀßÄ꤬¤¢¤Ã¤¿¡Ä¡£*/
-- skkserv_portnum = htons( servent->s_port ) ;
--#if defined(DEBUG)
-- fprintf
-- ( stderr, "getservbyname: \"%s\", %d\n",
-- servent->s_name, skkserv_portnum ) ;
-+#ifdef SKK_CONF
-+ if (confport)
-+ skkserv_portstr = strsave(confport);
-+ else
- #endif
-- }
-+ skkserv_portstr = SKKSERV_SERVICE_NAME;
- /* ´Ä¶­ÊÑ¿ô SKKSERV ¤¬ÀßÄꤵ¤ì¤Æ¤¤¤ì¤Ð¡¢¤½¤ì¤ò DEFAULT ¤Î skkserv *
- * host ¤È¤¹¤ë¡£*/
- if( ( skkserv_host = getenv( "SKKSERVER" ) ) == NULL )
-+#ifdef SKK_CONF
-+ if (confhost)
-+ skkserv_host = strsave(confhost); /* XXX this may leak */
-+ else
-+#endif
- skkserv_host = DEFAULT_SKKSERVER ;
-
- /* ¥Ç¥Õ¥©¥ë¥È¤Î¥­¡¼¥Þ¥Ã¥×¤òºîÀ®¤¹¤ë¡£*/
diff --git a/japanese/skkinput/patches/patch-ac b/japanese/skkinput/patches/patch-ac
deleted file mode 100644
index 688257d4598..00000000000
--- a/japanese/skkinput/patches/patch-ac
+++ /dev/null
@@ -1,75 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2000/11/09 03:54:07 itohy Exp $
-
---- skkldic.c.orig Fri Nov 14 13:04:12 1997
-+++ skkldic.c Wed Nov 8 20:01:38 2000
-@@ -27,6 +27,13 @@
- #include <sys/types.h>
- #include <X11/Intrinsic.h>
-
-+#ifdef CSRG_BASED
-+#include <sys/param.h>
-+#if defined(BSD) && BSD >= 199306
-+#define HAVE_MKSTEMP
-+#endif
-+#endif
-+
- #include "commondef.h"
- #include "buffers.h"
- #include "config.h"
-@@ -863,7 +870,12 @@
- {
- FILE *fpSrc, *fpDest ;
- unsigned long lines ;
-+#ifdef HAVE_MKSTEMP
-+ char tempfilename[64] ;
-+ int tmpfd;
-+#else
- char *tempfilename ;
-+#endif
-
- #ifdef DEBUG_LDIC
- fprintf( stderr, "Now saving ....\"%s\"\n", skkinput_local_jisyo_path ) ;
-@@ -890,7 +902,15 @@
- * ¸ºß¤·¤Ê¤¤¾ì¹ç¤Ï¤É¤¦¤¹¤ë¤Î¤«¡© */
-
- /* ¼­½ñ¤Î¹¹¿·¤ò¹Ô¤¦ºÝ¤ËÍøÍѤµ¤ì¤ë¥Æ¥ó¥Ý¥é¥ê¥Õ¥¡¥¤¥ë¡£*/
-+#ifdef HAVE_MKSTEMP
-+ strcpy(tempfilename, "/tmp/skkinputXXXXXXXX");
-+ if ((tmpfd = mkstemp(tempfilename)) < 0) {
-+ perror("skkinput: cannot create temp file");
-+ return;
-+ }
-+#else
- tempfilename = tmpnam( NULL ) ;
-+#endif
-
- /* ¶É½ê¼­½ñ¤Î¥Ð¥Ã¥¯¥¢¥Ã¥×¤òºï½ü¤¹¤ë¡£¼ºÇÔ¤·¤¿¾ì¹ç¤Ê¤ó¤«¤ÏÃΤé¤Ê¤¤¡£*/
- unlink( skkinput_jisyo_backup_path ) ;
-@@ -901,12 +921,19 @@
- skkinput_copyFile
- ( skkinput_local_jisyo_path, tempfilename ) ;
- /* ¶É½ê¼­½ñ¤Î¥³¥Ô¡¼¤¬Â¸ºß¤·¤Ê¤¤¡£¤³¤ì¤ÏÉÔÌ£¤¤¾õÂ֤Ǥ¢¤ë¡£*/
-+#ifdef HAVE_MKSTEMP
-+ if( ( fpSrc = fdopen( tmpfd, "rb" ) ) == NULL ){
-+ close(tmpfd);
-+ return;
-+ }
-+#else
- if( ( fpSrc = fopen( tempfilename, "rb" ) ) == NULL ){
- #ifdef DEBUG_LDIC
- fprintf( stderr, "cannot create backup jisyo...error!\n" ) ;
- #endif
- return ;
- }
-+#endif
- /* ½ñ¤­¹þ¤á¤Ê¤¤¡Ä¤³¤ì¤Ï̵Íý¤À¡Ä¡£*/
- if( ( fpDest = fopen( skkinput_local_jisyo_path, "wb" ) ) == NULL ){
- #ifdef DEBUG_LDIC
-@@ -922,6 +949,7 @@
- /* file coding system ¤òÄ´¤Ùľ¤¹¡£*/
- skkinput_local_jisyo_coding_system =
- check_skkinput_jisyo_code( skkinput_local_jisyo_path ) ;
-+ unlink( tempfilename ) ;
- return ;
- }
- lines = 0 ;
diff --git a/japanese/skkinput/patches/patch-ad b/japanese/skkinput/patches/patch-ad
deleted file mode 100644
index 8506e0550b9..00000000000
--- a/japanese/skkinput/patches/patch-ad
+++ /dev/null
@@ -1,184 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2000/11/09 03:54:08 itohy Exp $
-
---- skksoc.c.orig Thu Oct 30 13:40:59 1997
-+++ skksoc.c Wed Nov 8 21:48:24 2000
-@@ -36,6 +36,11 @@
-
- #include "commondef.h"
- #include "buffers.h"
-+#include "config.h"
-+
-+#ifdef PF_INET6
-+# define HAVE_GETADDRINFO
-+#endif
-
- /*
- * ¥×¥í¥È¥¿¥¤¥×Àë¸À¡£
-@@ -51,12 +56,15 @@
- } ;
-
- extern char *skkserv_host ;
--extern int skkserv_portnum ;
-+extern char *skkserv_portnum ;
-+extern char *skkserv_portstr ;
-
- /* skkserv ¤È¤ªÏ乤ëºÝ¤Î¥Ð¥Ã¥Õ¥¡¡£*/
- static struct MessageBuffer mesbuf ;
-+#ifndef HAVE_GETADDRINFO
- /* SKK server ¤Î¾ðÊó¡£*/
- struct sockaddr_in server ;
-+#endif
- /* SKK server ¤Î Host ¤Î¾ðÊó¡£*/
- static struct hostent *host ;
- /* skkserv ¤ò¤ªÏ乤ë¤Î¤ËÍøÍѤ¹¤ë socket */
-@@ -79,13 +87,14 @@
- static void myCharStringToNormalString
- ( struct MessageBuffer *buf, struct myChar *string ) ;
-
-+#ifndef HAVE_GETADDRINFO
- /*
- * ¥½¥±¥Ã¥È¤òºîÀ®¤¹¤ë´Ø¿ô¡£
- *------------
- * server ¤Î̾Á°¤¬Í¿¤¨¤é¤ì¤ë¤È¡¢¤½¤³¤ËÂФ·¤Æ¤Î socket ¤òºîÀ®¤·¤è¤¦
- * ¤È»î¤ß¤ë¡£
- */
--static int makeSocket( char *server_name, int port_num )
-+static int makeSocket( char *server_name )
- {
- struct protoent *proto;
- /* Protocol ¤ÎÀßÄê¡£*/
-@@ -115,22 +124,10 @@
- #else
- memcpy( &server.sin_addr, host->h_addr, host->h_length ) ;
- #endif
-- server.sin_port = htons( port_num ) ;
--
-- read_skkserv_fp = fdopen( skkserv_soc, "r" ) ;
-- write_skkserv_fp = fdopen( skkserv_soc, "w" ) ;
-
-- /* fdopen ¤Ë¼ºÇÔ¤·¤¿¤é¡Ä */
-- if( read_skkserv_fp == NULL || write_skkserv_fp == NULL ){
-- if( read_skkserv_fp != NULL )
-- fclose( read_skkserv_fp ) ;
-- if( write_skkserv_fp != NULL )
-- fclose( write_skkserv_fp ) ;
-- read_skkserv_fp = write_skkserv_fp = NULL ;
-- return 1 ;
-- }
- return 0 ;
- }
-+#endif /* ! HAVE_GETADDRINFO */
-
- /*
- * skkserv ¤Ë message ¤òÁ÷¿®¤¹¤ë´Ø¿ô¡£
-@@ -294,14 +291,72 @@
- * socket ¤òÍÑ°Õ¤·¡¢skkerv ¤ËÀܳ¤¹¤ë´Ø¿ô¡£
- *----
- */
--int skkinput_StartCommunication( char *server_name, int port_num )
-+int skkinput_StartCommunication( char *server_name, char *port_str )
- {
-+#ifdef HAVE_GETADDRINFO
-+ struct addrinfo aihint, *ai0, *ai;
-+ int error;
-+ char portnum[32];
-+
-+ /* backward compatibility */
-+ if (skkserv_portnum) {
-+ sprintf(portnum, "%d", skkserv_portnum);
-+ port_str = portnum;
-+ }
-+
-+#ifdef HAVE_BZERO
-+ bzero((char*)&aihint, sizeof aihint);
-+#else
-+ memset((char*)&aihint, 0, sizeof aihint);
-+#endif
-+ aihint.ai_family = PF_UNSPEC;
-+ aihint.ai_socktype = SOCK_STREAM;
-+ aihint.ai_flags = AI_CANONNAME;
-+ error = getaddrinfo(server_name, port_str, &aihint, &ai0);
-+ if (error) {
-+ printf("%s: %s\r\n", gai_strerror(error), server_name);
-+ return -1;
-+ }
-+
-+ skkserv_soc = -1;
-+ for (ai = ai0; ai; ai = ai->ai_next) {
-+ skkserv_soc = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
-+ if (skkserv_soc >= 0 &&
-+ connect(skkserv_soc, ai->ai_addr, ai->ai_addrlen) == 0)
-+ break;
-+ close(skkserv_soc);
-+ skkserv_soc = -1;
-+ }
-+ if (skkserv_soc < 0) {
-+ perror(server_name);
-+ skkserv_connection_ok = False ;
-+ return 1;
-+ }
-+#else
-+ struct servent *servent ;
-+ int port;
-+
-+ if ((port = atoi(port_str)) <= 0) {
-+ /* "/etc/services" ¤«¤é¥Ý¡¼¥ÈÈÖ¹æ¤òÆÀ¤Æ¤ª¤¯¡£*/
-+ servent = getservbyname( port_str, SKKSERV_SERVICE_PROTO ) ;
-+ if( servent == NULL ){
-+ /* /etc/services ¤ËÀßÄê¤Ï¤Ê¤«¤Ã¤¿¤Î¤Ç¡¢config.h ¤ÎÃæ¤Î¤ò»È¤¦¡£*/
-+ port = atoi( DEFAULT_SKKPORT ) ;
-+ } else {
-+ /* /etc/services ¤ËÀßÄ꤬¤¢¤Ã¤¿¡Ä¡£*/
-+ port = ntohs( servent->s_port ) ;
-+#if defined(DEBUG)
-+ fprintf( stderr, "getservbyname: \"%s\", %d\n", servent->s_name, port ) ;
-+#endif
-+ }
-+ }
- /* skkerv ¤ÈÄÌ¿®¤¹¤ë¤¿¤á¤Î¥½¥±¥Ã¥È¤òºîÀ®Ãפ·¤Þ¤¹¡£*/
-- if( makeSocket( server_name, port_num ) ){
-+ if( makeSocket( server_name ) ){
- fprintf( stderr, "Warning : cannot make a socket." ) ;
- skkserv_connection_ok = False ;
- return 1 ;
- }
-+ server.sin_port = htons( port ) ;
- /* ÀܳÍ׵ᡣ*/
- if( connect( skkserv_soc,
- ( struct sockaddr *)&server, sizeof( server ) ) < 0 ){
-@@ -312,6 +367,19 @@
- skkserv_connection_ok = False ;
- return 1 ;
- }
-+#endif
-+ read_skkserv_fp = fdopen( skkserv_soc, "r" ) ;
-+ write_skkserv_fp = fdopen( skkserv_soc, "w" ) ;
-+
-+ /* fdopen ¤Ë¼ºÇÔ¤·¤¿¤é¡Ä */
-+ if( read_skkserv_fp == NULL || write_skkserv_fp == NULL ){
-+ if( read_skkserv_fp != NULL )
-+ fclose( read_skkserv_fp ) ;
-+ if( write_skkserv_fp != NULL )
-+ fclose( write_skkserv_fp ) ;
-+ read_skkserv_fp = write_skkserv_fp = NULL ;
-+ return 1 ;
-+ }
- skkserv_connection_ok = True ;
- return 0 ;
- }
-@@ -357,13 +425,13 @@
-
- #ifndef MAIKAI_SKKSERV_TO_CONNECT_SURU
- if( !skkserv_connection_ok ){
-- if( skkinput_StartCommunication( skkserv_host, skkserv_portnum ) )
-+ if( skkinput_StartCommunication( skkserv_host, skkserv_portstr ) )
- return top ;
- }
- #else
- /* skkserv ¤¬À¸¤­¤Æ¤¤¤Ê¤±¤ì¤Ð¡¢¥á¥Ã¥»¡¼¥¸¤ÎÁ÷¤ê¤è¤¦¤¬Ìµ¤¤¤Î¤Ç½ªÎ»
- ¤¹¤ë¡£*/
-- if( skkinput_StartCommunication( skkserv_host, skkserv_portnum ) )
-+ if( skkinput_StartCommunication( skkserv_host, skkserv_portstr ) )
- return top ;
- #endif
-
diff --git a/japanese/skkinput/patches/patch-ae b/japanese/skkinput/patches/patch-ae
deleted file mode 100644
index 8aef772fb4c..00000000000
--- a/japanese/skkinput/patches/patch-ae
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2000/11/09 03:54:08 itohy Exp $
-
---- main.c.orig Mon Mar 23 15:05:22 1998
-+++ main.c Wed Nov 8 03:07:44 2000
-@@ -110,7 +110,7 @@
- extern void initHenkanKakuteiHashTable( void ) ;
- extern void clearHenkanKakuteiHash( void ) ;
- /* skksoc.c */
--extern int skkinput_StartCommunication( char *server_name, int port_num ) ;
-+extern int skkinput_StartCommunication( char *server_name, char *port_str ) ;
- extern int skkinput_CloseCommunication( void ) ;
- /* skkldic.c */
- extern int set_localjisyo
-@@ -197,6 +197,7 @@
- /* ¤½¤Î¾¡¢skkinput ¤¬É¬ÍפȤ¹¤ë¡ÄskkInputWidget Ëè¤Ë¤ÏɬÍפȤ·¤Ê¤¤¾ðÊó¡£*/
- char *skkserv_host ;
- int skkserv_portnum ;
-+char *skkserv_portstr ;
- char *skkinput_local_jisyo_name ;
- char *skkinput_backup_jisyo_name ;
- char *skk_local_jisyo_name ;
-@@ -375,7 +376,7 @@
- if( number_of_protocols > 0 ){
- #ifndef MAIKAI_SKKSERV_TO_CONNECT_SURU
- /* socket ¤òºîÀ®¤·¤Æ¤ª¤¯¡£*/
-- skkinput_StartCommunication( skkserv_host, skkserv_portnum ) ;
-+ skkinput_StartCommunication( skkserv_host, skkserv_portstr ) ;
- #endif
- /* ¶É½ê¼­½ñ¤Î¾ðÊó¤òÆþ¤ì¤Æ¤ª¤¯¡£*/
- set_localjisyo
-@@ -698,7 +699,7 @@
- break ;
- /* skkserv ¤ÈÄÌ¿®¤¹¤ë¤ËÍøÍѤ¹¤ë¥Ý¡¼¥ÈÈÖ¹æ¤òÀßÄꤹ¤ë¡£*/
- case OPTION_PORT :
-- skkserv_portnum = atoi( argv[ i ] ) ;
-+ skkserv_portstr = argv[ i ];
- break ;
- /* ¶É½ê¼­½ñ¤Î̾Á°¤òÀßÄꤹ¤ë¡£*/
- case OPTION_USERDIC :
diff --git a/japanese/skkserv/DESCR b/japanese/skkserv/DESCR
deleted file mode 100644
index 7694fcc0c93..00000000000
--- a/japanese/skkserv/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
- skkserv is a dictionary server for SKK (Simple Kana to
-Kanji conversion) programs, including skk.el (Emacs Lisp),
-skkfep (tty-based frontend), and skkinput (X11 frontend).
-
- This package also contains manipulation tools of
-SKK-format dictionaries.
diff --git a/japanese/skkserv/INSTALL b/japanese/skkserv/INSTALL
deleted file mode 100644
index 698139b7391..00000000000
--- a/japanese/skkserv/INSTALL
+++ /dev/null
@@ -1,13 +0,0 @@
-#! /bin/sh
-# $NetBSD: INSTALL,v 1.1 2001/10/31 23:29:39 zuntum Exp $
-
-case "$2" in
-POST-INSTALL)
- if egrep '^skkserv[ ]' /etc/services >/dev/null; then
- :
- else
- echo '
-skkserv 1178/tcp # SKK server' >>/etc/services
- fi
- ;;
-esac
diff --git a/japanese/skkserv/MESSAGE b/japanese/skkserv/MESSAGE
deleted file mode 100644
index 6c8e089343e..00000000000
--- a/japanese/skkserv/MESSAGE
+++ /dev/null
@@ -1,6 +0,0 @@
-======================================================================
-$NetBSD: MESSAGE,v 1.1 2001/10/31 23:29:39 zuntum Exp $
-
-Please add ${PREFIX}/etc/rc.d/skkserv to /etc/rc.local.
-
-======================================================================
diff --git a/japanese/skkserv/Makefile b/japanese/skkserv/Makefile
deleted file mode 100644
index bb28b1e7ee8..00000000000
--- a/japanese/skkserv/Makefile
+++ /dev/null
@@ -1,63 +0,0 @@
-# $NetBSD: Makefile,v 1.9 2001/11/29 01:12:38 hubertf Exp $
-
-DISTNAME= skk9.6
-PKGNAME= skkserv-3.9.4
-PKGREVISION= 1
-WRKSRC= ${WRKDIR}/skk-9.6
-CATEGORIES= japanese
-MASTER_SITES= ftp://skk.kuis.kyoto-u.ac.jp/skk/9.6/
-
-PATCHFILES= SKK-JISYO.L.diff.gz
-PATCH_SITES= http://www.ht-net21.ne.jp/%7Enaoki-w/skk/
-PATCH_DIST_ARGS= -d ${WRKSRC}/jisyo --forward --quiet
-
-MAINTAINER= packages@netbsd.org
-HOMEPAGE= http://skk.kuis.kyoto-u.ac.jp/
-COMMENT= Dictionary server for Simple Kana-Kanji conversion programs
-
-BUILD_DEFS+= USE_INET6
-
-DIST_SUBDIR= skk
-
-GNU_CONFIGURE= YES
-INSTALL_FILE= ${WRKDIR}/INSTALL
-
-.include "../../mk/bsd.prefs.mk"
-
-.if (${OPSYS} == "SunOS")
-.if exists(/usr/ccs)
-SKKSERV_UID?= 60002 # noaccess
-SKKSERV_GID?= 60002 # noaccess
-.else
-SKKSERV_UID?= 65534 # nobody
-SKKSERV_GID?= 65534 # nogroup
-.endif
-.endif
-SKKSERV_UID?= 32767 # nobody
-SKKSERV_GID?= 32766 # nogroup
-MAKE_ENV= SKKUID=${SKKSERV_UID} SKKGID=${SKKSERV_GID}
-
-# tmp for building dictionary. ~16MB required. mfs would be much faster.
-TMPDIR?= ${WRKDIR}
-
-post-build:
- ${SED} -e 's#@PREFIX@#${PREFIX}#g' <${FILESDIR}/skkserv.sh \
- >${WRKDIR}/skkserv.sh
- ${SED} -e 's#@PREFIX@#${PREFIX}#g' <${PKGDIR}/INSTALL >${INSTALL_FILE}
- :
- : Merging dictionaries....
- :
- ${WRKSRC}/jisyo-tools/skkdic-expr -d ${TMPDIR} \
- ${WRKSRC}/jisyo/SKK-JISYO.L + ${WRKSRC}/jisyo/SKK-JISYO.JIS2 | \
- ${WRKSRC}/jisyo-tools/skkdic-sort >${WRKDIR}/SKK-JISYO.L
-
-post-install:
- ${INSTALL_SCRIPT} ${WRKDIR}/skkserv.sh ${PREFIX}/etc/rc.d/skkserv
- ${INSTALL_DATA_DIR} ${PREFIX}/share/skk
- ${INSTALL_DATA} ${WRKDIR}/SKK-JISYO.L ${PREFIX}/share/skk/SKK-JISYO.L
- ${INSTALL_DATA} ${WRKSRC}/skkserv/README ${PREFIX}/share/skk/README.skkserv
- ${INSTALL_DATA} ${WRKSRC}/jisyo-tools/README.1st ${PREFIX}/share/skk/README.1st.jisyo-tools
- ${INSTALL_DATA} ${WRKSRC}/jisyo-tools/README ${PREFIX}/share/skk/README.jisyo-tools
- ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/japanese/skkserv/PLIST b/japanese/skkserv/PLIST
deleted file mode 100644
index cd73ea14c17..00000000000
--- a/japanese/skkserv/PLIST
+++ /dev/null
@@ -1,11 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:29:39 zuntum Exp $
-bin/skkdic-expr
-bin/skkdic-sort
-bin/skkdic-count
-etc/rc.d/skkserv
-libexec/skkserv
-share/skk/SKK-JISYO.L
-share/skk/README.skkserv
-share/skk/README.1st.jisyo-tools
-share/skk/README.jisyo-tools
-@dirrm share/skk
diff --git a/japanese/skkserv/distinfo b/japanese/skkserv/distinfo
deleted file mode 100644
index 579b351c56b..00000000000
--- a/japanese/skkserv/distinfo
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: distinfo,v 1.3 2001/11/18 12:21:05 frueauf Exp $
-
-SHA1 (skk/skk9.6.tar.gz) = f462b4586dff6e36bfe331a526e054c3f6c3aad9
-Size (skk/skk9.6.tar.gz) = 2407653 bytes
-SHA1 (skk/SKK-JISYO.L.diff.gz) = aecf9a7aa8607b9e9a4a3c7e74268ffb09c775ad
-Size (skk/SKK-JISYO.L.diff.gz) = 15533 bytes
-SHA1 (patch-aa) = d9ee708fe5dcf36258256bdb4ba4c8d7e16905da
-SHA1 (patch-ab) = 5103484679c5d82a8d79460cc24e8857fc89460a
-SHA1 (patch-ac) = 3a1818c3bb453b69eb23154ed0daa6909275774b
-SHA1 (patch-ad) = 27abe12b627e8e5c5de0a78fab3a5f4551f3c0f7
-SHA1 (patch-ae) = 356b3bab93365bb769a340b99979161f07f60de4
-SHA1 (patch-af) = 0ee1792a36a220096048801346c466c9e3ec2736
-SHA1 (patch-ag) = f60d3e410cfc1c438827fa498e5fa4bc4dc3ec46
-SHA1 (patch-ah) = 414fc705a685f0276ae3a66d2f2546e1e7767495
-SHA1 (patch-bsearch) = d753fe29c2d0301a9e7bbf8c2d1f624447761cad
-SHA1 (patch-jisyo) = 0711c55fb8df69648bd182de68ea6a69d42ac9af
diff --git a/japanese/skkserv/files/skkserv.sh b/japanese/skkserv/files/skkserv.sh
deleted file mode 100644
index c851ccc8353..00000000000
--- a/japanese/skkserv/files/skkserv.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: skkserv.sh,v 1.3 2001/01/16 23:28:11 pooka Exp $
-#
-# PROVIDE: skkserv
-# REQUIRE: DAEMON
-
-name="skkserv"
-command="@PREFIX@/libexec/skkserv"
-pidfile=""
-
-cmd=${1:-start}
-
-case ${cmd} in
-start)
- if [ -x ${command} ]; then
- echo "Starting ${name}."
- ${command} > /dev/null 2>&1
- fi
- ;;
-*)
- if [ -x ${command} ]; then
- ${command} ${cmd} > /dev/null 2>&1
- fi
- ;;
-esac
diff --git a/japanese/skkserv/patches/patch-aa b/japanese/skkserv/patches/patch-aa
deleted file mode 100644
index 23128327c5d..00000000000
--- a/japanese/skkserv/patches/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/12/24 03:19:23 itohy Exp $
-
---- Makefile.in.orig Mon Feb 3 18:21:39 1997
-+++ Makefile.in Tue Dec 21 20:03:09 1999
-@@ -33,7 +33,7 @@
- JISYO = @JISYO@
- JISYODIR = $(datadir)/skk
-
--SUBDIRS = lisp skkserv jisyo-tools doc etc
-+SUBDIRS = skkserv jisyo-tools
-
- MDEFINES = CC='$(CC)' CFLAGS='$(CFLAGS)' LDFLAGS='$(LDFLAGS)' \
- EMACS='$(EMACS)' JISYO='$(JISYO)' JISYODIR='$(JISYODIR)' \
-@@ -50,7 +50,6 @@
- echo making $@ in $$subdir; \
- (cd $$subdir && $(MAKE) $(MDEFINES) $@) || exit 1; \
- done
-- $(INSTALL_DATA) jisyo/$(JISYO) $(JISYODIR)/$(JISYO)
-
- clean:
- cd lisp; $(MAKE) clean
diff --git a/japanese/skkserv/patches/patch-ab b/japanese/skkserv/patches/patch-ab
deleted file mode 100644
index 125f6a8fa94..00000000000
--- a/japanese/skkserv/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 1999/12/24 03:19:23 itohy Exp $
-
---- configure.in.orig Mon Feb 3 17:02:01 1997
-+++ configure.in Tue Dec 21 15:46:54 1999
-@@ -18,7 +18,7 @@
- AC_PROG_GCC_TRADITIONAL
- AC_FUNC_SETPGRP
- AC_TYPE_SIGNAL
--AC_CHECK_FUNCS(bzero tiocnotty getdtablesize)
-+AC_CHECK_FUNCS(bzero setsid getdtablesize)
-
- AC_CHECK_FUNC(dbm_open, , [DBMLIB="-ldbm"])
-
diff --git a/japanese/skkserv/patches/patch-ac b/japanese/skkserv/patches/patch-ac
deleted file mode 100644
index 0542b2cfc61..00000000000
--- a/japanese/skkserv/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 1999/12/24 03:19:23 itohy Exp $
-
---- config.h.in.orig Fri Jan 17 20:27:10 1997
-+++ config.h.in Tue Dec 21 15:52:49 1999
-@@ -15,8 +15,8 @@
- /* Define if you have the getdtablesize function. */
- #undef HAVE_GETDTABLESIZE
-
--/* Define if you have the tiocnotty function. */
--#undef HAVE_TIOCNOTTY
-+/* Define if you have the setsid function. */
-+#undef HAVE_SETSID
-
- /* Define if you have the <fcntl.h> header file. */
- #undef HAVE_FCNTL_H
diff --git a/japanese/skkserv/patches/patch-ad b/japanese/skkserv/patches/patch-ad
deleted file mode 100644
index 15df3e012da..00000000000
--- a/japanese/skkserv/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 1999/12/24 03:19:23 itohy Exp $
-
---- configure.orig Fri Feb 7 14:00:43 1997
-+++ configure Tue Dec 21 15:46:55 1999
-@@ -1191,7 +1191,7 @@
- EOF
-
-
--for ac_func in bzero tiocnotty getdtablesize
-+for ac_func in bzero setsid getdtablesize
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
- echo "configure:1198: checking for $ac_func" >&5
diff --git a/japanese/skkserv/patches/patch-ae b/japanese/skkserv/patches/patch-ae
deleted file mode 100644
index 5ef74e1009a..00000000000
--- a/japanese/skkserv/patches/patch-ae
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 1999/12/24 03:19:23 itohy Exp $
-
---- skkserv/Makefile.in.orig Fri Feb 7 11:05:23 1997
-+++ skkserv/Makefile.in Tue Dec 21 07:41:57 1999
-@@ -28,7 +28,8 @@
- SERVERDIR = @libexecdir@
-
- DEFS = -I$(srcdir) -I$(top_srcdir) $(CFLAGS) @DEFS@ @PRIVATE@ \
-- -DDEFAULT_JISYO=\"$(JISYODIR)/$(JISYO)\"
-+ -DDEFAULT_JISYO=\"$(JISYODIR)/$(JISYO)\" \
-+ -DSKKSERV_UID=${SKKUID} -DSKKSERV_GID=${SKKGID}
-
- all: skkserv
-
diff --git a/japanese/skkserv/patches/patch-af b/japanese/skkserv/patches/patch-af
deleted file mode 100644
index a57c3aa4fa9..00000000000
--- a/japanese/skkserv/patches/patch-af
+++ /dev/null
@@ -1,282 +0,0 @@
-$NetBSD: patch-af,v 1.3 2000/11/09 03:52:51 itohy Exp $
-
---- skkserv/skkserv.c.orig Tue Jan 21 04:16:36 1997
-+++ skkserv/skkserv.c Mon Nov 6 00:12:57 2000
-@@ -100,14 +100,16 @@
- #define SERVER_NOT_FOUND "4"
- #define SERVER_FULL "9"
-
-+#define warn(m) \
-+ {if (debug) fprintf(errout, "%s: %s\n", pgmnm, m);}
- #define err(m) \
-- {if (debug) fprintf(errout, "%s: %s\n", pgmnm, m); exit(1);}
-+ {warn(m); exit(1);}
-
- /*
- * Global Variables
- */
-
--char pgmver[] = "3.9.4 "; /* version number */
-+char pgmver[] = "3.9.4nb1 "; /* version number */
-
- char *pgmnm; /* program name */
- char *jname; /* name of shared dictionary */
-@@ -121,6 +123,9 @@
- int jtab1[KANAMOJI]; /* index-table by 1st letter (1st part)*/
- int jtab2[KANAMOJI]; /* index-table by 1st letter (2nd part)*/
- int initsock; /* socket for waiting requests */
-+#ifdef PF_INET6
-+int initsock6; /* IPv6 socket for waiting requests */
-+#endif
- int clientsock[MAXCLNT]; /* socket for each client */
- int nclients; /* max index for active clients */
-
-@@ -130,8 +135,18 @@
- int parg;
- int setjisho = 0;
- int ctlterm; /* fildes for control terminal */
-- void reread();
-+ RETSIGTYPE req_reread();
-+
-+#ifdef SKKSERV_UID
-+ gid_t gid = SKKSERV_GID;
-
-+ /* revoke privilege if any */
-+ if (geteuid() == 0) {
-+ setgroups(1, &gid);
-+ setgid(SKKSERV_GID);
-+ setuid(SKKSERV_UID);
-+ }
-+#endif
- pgmnm = argv[0];
- debug = 0;
- errout = stderr;
-@@ -200,7 +215,10 @@
- fclose(stderr);
-
- /* detach child process from control terminal */
--#ifdef HAVE_TIOCNOTTY
-+#ifdef HAVE_SETSID
-+ setsid();
-+#else
-+#ifdef TIOCNOTTY
- if ((ctlterm = open("/dev/tty", 2)) >= 0) {
- ioctl(ctlterm, TIOCNOTTY, 0);
- close(ctlterm);
-@@ -215,6 +233,7 @@
- signal(SIGHUP, SIG_IGN);
- if (fork() != 0) exit(0);
- #endif
-+#endif
- } else { /* debug mode */
- fprintf(errout, "SKK-JISYO is %s\n", jname);
- fflush(errout);
-@@ -222,7 +241,7 @@
- if (errout != stderr) fclose(stderr);
- }
-
-- signal(SIGINT, reread);
-+ signal(SIGINT, req_reread);
- /* 1993/6/5 by kam, re-read dictionary by "INT" signal */
-
- nclients = 0;
-@@ -244,8 +263,11 @@
- mksock()
- {
- struct sockaddr_in sin;
-+#ifdef PF_INET6
-+ struct sockaddr_in6 sin6;
-+#endif
- struct servent *sp;
-- int optbuf = 1; /* enable socket REUSEADDR */
-+ int optbuf; /* enable socket REUSEADDR */
-
- bzero((char*)&sin, sizeof(sin));
- sin.sin_family = AF_INET;
-@@ -262,16 +284,54 @@
- sin.sin_port = htons(portnum);
-
- if ((initsock = socket(PF_INET, SOCK_STREAM, 0)) < 0)
-- err("socket error; socket cannot be created");
-- if (setsockopt(initsock, SOL_SOCKET, SO_REUSEADDR,
-+ warn("socket error; socket cannot be created");
-+#ifdef PF_INET6
-+ bzero((char*)&sin6, sizeof(sin6));
-+ sin6.sin6_family = AF_INET6;
-+ /* sin6.sin6_addr.s6_addr = IN6ADDR_ANY_INIT; ... all-zero pattern */
-+ sin6.sin6_port = htons(portnum);
-+ if ((initsock6 = socket(PF_INET6, SOCK_STREAM, 0)) < 0)
-+ warn("socket error; IPv6 socket cannot be created");
-+#endif
-+ optbuf = 1;
-+ if (initsock >= 0 && setsockopt(initsock, SOL_SOCKET, SO_REUSEADDR,
-+ &optbuf, sizeof(optbuf)) < 0)
-+ warn("socket error; cannot set socket option");
-+#ifdef PF_INET6
-+ optbuf = 1;
-+ if (initsock6 >= 0 && setsockopt(initsock6, SOL_SOCKET, SO_REUSEADDR,
- &optbuf, sizeof(optbuf)) < 0)
-- err("socket error; cannot set socket option");
-- if (bind(initsock, (struct sockaddr *)&sin, sizeof(sin))< 0)
-- err("bind error; the socket is already used");
-- if (listen(initsock, MAXQUE) < 0)
-+ warn("socket error; cannot set socket option");
-+#endif
-+ if (initsock >= 0 && bind(initsock, (struct sockaddr *)&sin, sizeof(sin))< 0) {
-+ warn("bind error; the socket is already used");
-+ close(initsock);
-+ initsock = -1;
-+ }
-+#ifdef PF_INET6
-+ if (initsock6 >= 0 && bind(initsock6, (struct sockaddr *)&sin6, sizeof(sin6))< 0) {
-+ warn("bind error; the socket is already used");
-+ close(initsock6);
-+ initsock6 = -1;
-+ }
-+#endif
-+ if (initsock < 0
-+#ifdef PF_INET6
-+ && initsock6 < 0
-+#endif
-+ )
-+ exit(1);
-+ if (initsock >= 0 && listen(initsock, MAXQUE) < 0)
- err("listen error; something wrong happened with the socket");
-+#ifdef PF_INET6
-+ if (initsock6 >= 0 && listen(initsock6, MAXQUE) < 0)
-+ err("listen error; something wrong happened with the IPv6 socket");
-+#endif
- if (debug) {
- fprintf(errout, "file descriptor for initsock is %d\n", initsock);
-+#ifdef PF_INET6
-+ fprintf(errout, "file descriptor for initsock6 is %d\n", initsock6);
-+#endif
- fflush(errout);
- }
- }
-@@ -303,8 +363,19 @@
- mkoldjtab(buf);
- }
-
-+/* using stdio in signal handler is unsafe */
-+#ifdef __STDC__
-+volatile
-+#endif
-+int reread_requested;
-+
-+RETSIGTYPE req_reread()
-+{
-+ reread_requested = 1;
-+}
-+
- /* 1993/6/5 by kam, re-read dictionary by "INT" signal */
--RETSIGTYPE reread()
-+void reread()
- {
- if (fclose(jisho) < 0) {
- fprintf(stderr,
-@@ -455,15 +526,22 @@
- main_loop()
- {
- fd_set readfds, writefds, exceptfds;
-- fd_set getrfds();
-+ void getrfds();
- struct sockaddr_in from;
-+#ifdef PF_INET6
-+ struct sockaddr_in6 from6;
-+#endif
- int len;
- register int i;
-
- FD_ZERO(&writefds);
- FD_ZERO(&exceptfds);
- for(;;) { /* infinite loop; waiting for client's request */
-- readfds = getrfds();
-+ if (reread_requested) {
-+ reread();
-+ reread_requested = 0;
-+ }
-+ getrfds(&readfds);
- if (select(MAXDTAB, &readfds, &writefds, &exceptfds, NULL) < 0) {
- if (errno == EINTR) /* if signal happens */
- continue;
-@@ -474,16 +552,32 @@
- fflush(errout);
- }
-
-- if (FD_ISSET(initsock, &readfds)) {
-+ if (initsock >= 0 && FD_ISSET(initsock, &readfds)) {
- len = sizeof(from);
- if ((clientsock[nclients ++] = accept(initsock, &from, &len)) < 0) {
- err("accept error; something wrong happened with the socket");
- }
-- if (nclients >= MAXDTAB - 3 - debug * 2) {
-+ if (nclients >= MAXDTAB - 3
-+#ifdef PF_INET6
-+ -1
-+#endif
-+ - debug * 2) {
- write(clientsock[--nclients], SERVER_FULL, 1);
- close(clientsock[nclients]);
- }
- }
-+#ifdef PF_INET6
-+ if (initsock6 >= 0 && FD_ISSET(initsock6, &readfds)) {
-+ len = sizeof(from6);
-+ if ((clientsock[nclients ++] = accept(initsock6, &from6, &len)) < 0) {
-+ err("accept error; something wrong happened with the socket");
-+ }
-+ if (nclients >= MAXDTAB - 4 - debug * 2) {
-+ write(clientsock[--nclients], SERVER_FULL, 1);
-+ close(clientsock[nclients]);
-+ }
-+ }
-+#endif
-
- /* naiive scheduling */
- for (i = 0; i < nclients; i ++)
-@@ -511,16 +605,20 @@
- * get bit pattern of read file descriptor
- */
-
--fd_set getrfds()
-+void getrfds(rfds)
-+fd_set *rfds;
- {
-- fd_set rfds;
- register int i;
-
-- FD_ZERO(&rfds);
-- FD_SET(initsock, &rfds);
-+ FD_ZERO(rfds);
-+ if (initsock >= 0)
-+ FD_SET(initsock, rfds);
-+#ifdef PF_INET6
-+ if (initsock6 >= 0)
-+ FD_SET(initsock6, rfds);
-+#endif
- for (i = 0; i < nclients; i ++)
-- FD_SET(clientsock[i], &rfds);
-- return (rfds);
-+ FD_SET(clientsock[i], rfds);
- }
-
- /*
-@@ -724,6 +822,9 @@
- exit(1);
- }
- hentry = gethostbyname(hname);
-+ if (hentry == NULL) {
-+ fprintf(errout, "%s: WARNING: gethostbyname(%s) failed\n", pgmnm, hname);
-+ } else {
- #ifdef NO_ADDR_LIST
- strcat(hname, ":");
- strcat(hname, hentry->h_addr);
-@@ -736,6 +837,7 @@
- strcat(hname, inet_ntoa(*(struct in_addr *)*p++));
- }
- #endif
-+ }
- strcat(hname, ": ");
- }
-
diff --git a/japanese/skkserv/patches/patch-ag b/japanese/skkserv/patches/patch-ag
deleted file mode 100644
index cb4b002e434..00000000000
--- a/japanese/skkserv/patches/patch-ag
+++ /dev/null
@@ -1,142 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2000/11/09 03:52:51 itohy Exp $
-
---- jisyo-tools/skkdic-expr.c.orig Tue Dec 17 14:51:28 1996
-+++ jisyo-tools/skkdic-expr.c Mon Nov 6 01:34:22 2000
-@@ -78,59 +78,86 @@
- }
- }
-
-+#if !defined(dbm_pagfno) || defined(DBM_SUFFIX)
-+#define NEW_DB
-+#endif
-+
- /* ºî¶ÈÍѥǡ¼¥¿¥Ù¡¼¥¹¥Õ¥¡¥¤¥ë¤òºï½ü
- file_name ¤Ë¤Ï content ¤¬³ÊǼ¤µ¤ì¤ë */
- static void db_remove_files()
- {
-- char pag_name[256];
-- char dir_name[256];
-+ char db_name[256];
-
- db_remove_file(file_name);
-- sprintf(pag_name, "%s.pag", file_name);
-- db_remove_file(pag_name);
-- sprintf(dir_name, "%s.dir", file_name);
-- db_remove_file(dir_name);
-+#ifdef NEW_DB
-+ sprintf(db_name, "%s.db", file_name);
-+ db_remove_file(db_name);
-+#else
-+ sprintf(db_name, "%s.pag", file_name);
-+ db_remove_file(db_name);
-+ sprintf(db_name, "%s.dir", file_name);
-+ db_remove_file(db_name);
-+#endif
-
- if (okurigana_flag) {
- db_remove_file(okuri_head_name);
-- sprintf(pag_name, "%s.pag", okuri_head_name);
-- db_remove_file(pag_name);
-- sprintf(dir_name, "%s.dir", okuri_head_name);
-- db_remove_file(dir_name);
-+#ifdef NEW_DB
-+ sprintf(db_name, "%s.db", okuri_head_name);
-+ db_remove_file(db_name);
-+#else
-+ sprintf(db_name, "%s.pag", okuri_head_name);
-+ db_remove_file(db_name);
-+ sprintf(db_name, "%s.dir", okuri_head_name);
-+ db_remove_file(db_name);
-+#endif
-
- db_remove_file(okuri_tail_name);
-- sprintf(pag_name, "%s.pag", okuri_tail_name);
-- db_remove_file(pag_name);
-- sprintf(dir_name, "%s.dir", okuri_tail_name);
-- db_remove_file(dir_name);
-+#ifdef NEW_DB
-+ sprintf(db_name, "%s.db", okuri_tail_name);
-+ db_remove_file(db_name);
-+#else
-+ sprintf(db_name, "%s.pag", okuri_tail_name);
-+ db_remove_file(db_name);
-+ sprintf(db_name, "%s.dir", okuri_tail_name);
-+ db_remove_file(db_name);
-+#endif
- }
- }
-
-+#ifndef O_EXCL
-+#define O_EXCL 0
-+#endif
-+
- /* ¥Ç¡¼¥¿¥Ù¡¼¥¹¥Õ¥¡¥¤¥ë¤òºîÀ® */
--static void db_make_files()
-+static void db_make_files(tmpdir)
-+ char *tmpdir;
- {
-- sprintf(file_name, "/tmp/skkjisyo.%d", getpid());
-+ int pid = getpid();
-+ int fd;
-+
-+ sprintf(file_name, "%s/skkjisyo.%d", tmpdir, pid);
- if (okurigana_flag) {
-- sprintf(okuri_head_name, "/tmp/skkhead.%d", getpid());
-- sprintf(okuri_tail_name, "/tmp/skktail.%d", getpid());
-+ sprintf(okuri_head_name, "%s/skkhead.%d", tmpdir, pid);
-+ sprintf(okuri_tail_name, "%s/skktail.%d", tmpdir, pid);
- }
-
- db_remove_files();
-- if ((db = dbm_open(file_name, O_RDWR|O_CREAT, 0600)) == NULL){
-+ if ((db = dbm_open(file_name, O_RDWR|O_CREAT|O_EXCL, 0600)) == NULL){
- perror(file_name);
- exit(1);
- }
-- if ((dbcontent = fopen(file_name, "w+")) == NULL){
-+ if ((fd = open(file_name, O_RDWR|O_CREAT|O_EXCL, 0600)) < 0 ||
-+ (dbcontent = fdopen(fd, "w+")) == NULL){
- perror(file_name);
- exit(1);
- }
- if (okurigana_flag) {
-- if ((okuriheaddb = dbm_open(okuri_head_name, O_RDWR|O_CREAT, 0600))
-+ if ((okuriheaddb = dbm_open(okuri_head_name, O_RDWR|O_CREAT|O_EXCL, 0600))
- == NULL){
- perror(okuri_head_name);
- exit(1);
- }
-- if ((okuritaildb = dbm_open(okuri_tail_name, O_RDWR|O_CREAT, 0600))
-+ if ((okuritaildb = dbm_open(okuri_tail_name, O_RDWR|O_CREAT|O_EXCL, 0600))
- == NULL){
- perror(okuri_tail_name);
- exit(1);
-@@ -698,7 +725,7 @@
- for (key = dbm_firstkey(db); key.dptr != NULL; key = dbm_nextkey(db)) {
- content = dbm_fetch(db, key);
- for(i = 0; i < key.dsize; ++ i)
-- putc((key.dptr)[i], output);
-+ putc(((char *) key.dptr)[i], output);
- putc(' ', output);
- fseek(dbcontent, getpos(content.dptr), 0);
- db_gets(kanji, BLEN, dbcontent);
-@@ -716,7 +743,7 @@
- if (entry.dptr != NULL) continue;
-
- for(i = 0; i < key.dsize; ++ i)
-- putc((key.dptr)[i], output);
-+ putc(((char *) key.dptr)[i], output);
- putc(' ', output);
- putc('/', output);
- okuri_type_out(&key, output);
-@@ -775,9 +802,8 @@
- exit(1);
- }
-
-- sprintf(file_name, "%s/skkjisyo.%d", tmpdir, getpid());
- set_signal_handler();
-- db_make_files();
-+ db_make_files(tmpdir);
-
- negate = 0;
- for (; i < argc; ++ i) {
diff --git a/japanese/skkserv/patches/patch-ah b/japanese/skkserv/patches/patch-ah
deleted file mode 100644
index 9719473cef0..00000000000
--- a/japanese/skkserv/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2001/11/18 12:21:05 frueauf Exp $
-
---- jisyo-tools/skkdic-sort.c-orig Tue Dec 17 06:51:28 1996
-+++ jisyo-tools/skkdic-sort.c Sun Nov 18 13:01:23 2001
-@@ -22,7 +22,7 @@
- */
-
- #include <stdio.h>
--#ifndef NO_MALLOC_H
-+#ifdef HAVE_MALLOC_H
- #include <malloc.h>
- #endif
-
diff --git a/japanese/skkserv/patches/patch-bsearch b/japanese/skkserv/patches/patch-bsearch
deleted file mode 100644
index 07a3d35be5d..00000000000
--- a/japanese/skkserv/patches/patch-bsearch
+++ /dev/null
@@ -1,123 +0,0 @@
-$NetBSD: patch-bsearch,v 1.2 2000/11/09 03:52:51 itohy Exp $
-
-Binary search patch.
-Originally from skk-users mailing list
-(Masahiro Doteguchi, Mailinglist-Id: 1779).
-
---- skkserv/skkserv.c.patch1 Mon Nov 6 00:12:57 2000
-+++ skkserv/skkserv.c Mon Nov 6 00:15:00 2000
-@@ -109,7 +109,7 @@
- * Global Variables
- */
-
--char pgmver[] = "3.9.4nb1 "; /* version number */
-+char pgmver[] = "3.9.4nb1 (binary search) "; /* version number */
-
- char *pgmnm; /* program name */
- char *jname; /* name of shared dictionary */
-@@ -622,7 +622,7 @@
- }
-
- /*
-- * reply to client: linear search
-+ * reply to client: binary search
- */
-
- search(commsock)
-@@ -635,6 +635,7 @@
- int n; /* number of characters from client */
- int sttpnt; /* start point of searching */
- int endpnt; /* end point of searching */
-+ int curpnt; /* current point of searching */
- int errcod = 0; /* error flag */
- int sstyle; /* search style */
-
-@@ -743,18 +744,36 @@
- endpnt = jtab1[KANA_END - code + 1];
- }
- }
-- fseek(jisho, sttpnt, 0);
- if (debug)
-- fprintf(stderr, "from %d to %d\n", sttpnt, endpnt);
-+ fprintf(errout, "from %d to %d\n", sttpnt, endpnt);
-
-- while ((c = fgetc(jisho)) != EOF) {
-+ for (;;) {
-+ if ((sstyle & 0x4) == 0) { /* binary search? */
-+ curpnt = (sttpnt + endpnt) / 2;
-+ fseek(jisho, curpnt, 0);
-+ while ((c = fgetc(jisho)) != EOF) {
-+ curpnt++;
-+ if (c == EOL) break;
-+ }
-+ if (c == EOF) break;
-+ if (curpnt >= endpnt) {
-+ fseek(jisho, sttpnt, 0);
-+ sstyle |= 0x4; /* linear search */
-+ }
-+ }
-+
-+ if (debug) {fprintf(errout, "%d:%d\t%d\t%d\t", sstyle, sttpnt, curpnt, endpnt);}
-+ c = fgetc(jisho);
- pbuf = &combuf[1]; /* ' ' is end-symbol */
- while (c == *pbuf && c != ' ' && c != EOL) {
-- if (debug) {fprintf(errout, "1:%d:%d:%d:%d:\n", c, *pbuf, ' ', EOL);}
-+/* if (debug) {fprintf(errout, "1:%d:%d:%d:%d:", c, *pbuf, ' ', EOL);}*/
-+ if (debug) {fprintf(errout, "%c", c);}
- c = fgetc(jisho); pbuf++;
-- }
-- if (debug) {fprintf(errout, "1:%d:%d:%d:%d:\n", c, *pbuf, ' ', EOL);}
-+ }
-+/* if (debug) {fprintf(errout, "1:%d:%d:%d:%d:", c, *pbuf, ' ', EOL);}*/
-+ if (debug) {fprintf(errout, "%c", c);}
- if (c == ' ' && (*pbuf == ' ' || *pbuf == '\n')) { /* found */
-+ if (debug) {fprintf(errout, "found\n");}
- if ((errcod = write(commsock, SERVER_FOUND, 1)) >= 0)
- while ((c = fgetc(jisho)) != EOF) {
- *pbuf = c;
-@@ -770,18 +789,35 @@
- }
- return(0);
- }
-- if (comp(*pbuf, c, sstyle)) {
-- if (debug) {
-- fprintf(stderr, "comp break %d \n", ftell(jisho));
-- }
-- break;
-+ if (debug) {
-+ int ch;
-+
-+ if (c != ' ')
-+ do {
-+ ch = fgetc(jisho);
-+ fprintf(errout, "%c", ch);
-+ } while (ch != ' ' && ch != EOL);
-+ fprintf(errout, "unmatched\n");
- }
-- /* fix 1992/3/6 under suggestion */
-- /* of guchi@pfu.fujitsu.co.jp */
-- while ((c = fgetc(jisho)) != EOF) {
-- if (c == EOL) break;
-+ if (sstyle & 0x4) {
-+ if (comp(*pbuf, c, sstyle&~0x4)) {
-+ if (debug) {
-+ fprintf(stderr, "comp break %d \n", ftell(jisho));
-+ }
-+ break;
-+ }
-+ /* fix 1992/3/6 under suggestion */
-+ /* of guchi@pfu.fujitsu.co.jp */
-+ while ((c = fgetc(jisho)) != EOF) {
-+ if (c == EOL) break;
-+ }
-+ if (ftell(jisho) >= endpnt) break;
-+ } else {
-+ if (comp(*pbuf, c, sstyle&~0x4))
-+ endpnt = curpnt;
-+ else
-+ sttpnt = curpnt;
- }
-- if (ftell(jisho) >= endpnt) break;
- }
-
- if ((errcod = write(commsock, SERVER_NOT_FOUND, 1)) >= 0) {
diff --git a/japanese/skkserv/patches/patch-jisyo b/japanese/skkserv/patches/patch-jisyo
deleted file mode 100644
index 66ff6df9860..00000000000
--- a/japanese/skkserv/patches/patch-jisyo
+++ /dev/null
@@ -1,112 +0,0 @@
-$NetBSD: patch-jisyo,v 1.3 1999/12/27 23:21:22 itohy Exp $
-
-Dictionary (SKK-JISYO.L) corrigenda.
-Partially from skk-dic mailing list.
-
---- jisyo/SKK-JISYO.L.fix1 Mon Dec 20 16:28:52 1999
-+++ jisyo/SKK-JISYO.L Mon Dec 27 23:53:47 1999
-@@ -3530,7 +3530,7 @@
- ¤·¤ê¤¢e /ÃΤê¹ç/
- ¤·¤é¤Ùr /Ä´¤Ù/
- ¤·¤é¤¸¤és /Çò¡¹/
--¤·¤és /Êó/ÃΤé/ÃΤ餻/
-+¤·¤és /Êó/ÃΤé/
- ¤·¤ém /Çò/
- ¤·¤ék /Çò/
- ¤·¤éb /Ä´/
-@@ -4216,9 +4216,9 @@
- ¤°i /¿©/
- ¤¯¤ó¤èm /·±ÆÉ/
- ¤¯¤ó¤Åk /·¯ÉÕ/
--¤¯¤ï¤ït /²Ã/
-+¤¯¤ï¤ït /²Ã¤ï/
- ¤¯¤ï¤Àt /´ë/
--¤¯¤ïw /²Ã¤ï/
-+¤¯¤ïw /²Ã/
- ¤¯¤ïs /¾Ü/²Ã/
- ¤¯¤ïk /¶èʬ/
- ¤¯¤ïe /²Ã/Òú/îò/²Ã¤¨/
-@@ -30746,7 +30746,7 @@
- ¤¬¤¤¤«¤ó¤Ó /³°´ÑÈþ/
- ¤¬¤¤¤­ /³°µ¤/
- ¤¬¤¤¤­¤ª¤ó /³°µ¤²¹/
--¤¬¤¤¤­¤ç¤¦ /³µ¶·/³°¶©/
-+¤¬¤¤¤­¤ç¤¦ /³µ¶·/³°ãþ/
- ¤¬¤¤¤­¤ç¤¯ /³°¶É/
- ¤¬¤¤¤­¤ì¤¤¤Ü¤¦ /³°µ¤Îä˼/
- ¤¬¤¤¤­¤ó /³°¶Ð/
-@@ -34044,7 +34044,7 @@
- ¤­¤å¤¦¤­¤å¤¦¤¿¤¤ /µßµÞÂâ/
- ¤­¤å¤¦¤­¤å¤¦¤Ð¤³ /µßµÞÈ¢/
- ¤­¤å¤¦¤­¤å¤¦¤Ð¤ó¤½¤¦¤³¤¦ /µßµÞå«ÁϹÑ/
--¤­¤å¤¦¤­¤ç /µÞµò/µÞî±/µÞ¤­¤ç/
-+¤­¤å¤¦¤­¤ç /µÞî±/µÞ¤­¤ç/
- ¤­¤å¤¦¤­¤ç¤¦ /µç¶­/
- ¤­¤å¤¦¤­¤ç¤¦¤µ¤ó¤±¤ó¤·¤ç¤³¤¯ /µì¶¦»º·÷½ô¹ñ/
- ¤­¤å¤¦¤­¤ç¤¦¤·¤ç¤¯¤¤¤ó /µì¶µ¿¦°÷/
-@@ -35040,9 +35040,9 @@
- ¤­¤ç¤¦¤¾¤ó¤­¤ç¤¦¤¨¤¤ /¶¦Â¸¶¦±É/
- ¤­¤ç¤¦¤¾¤ó¤Û¤¦ /¶¦Â¸Ë¡/
- ¤­¤ç¤¦¤¾¤ó¤Û¤¦¤Û¤¦ /¶¦Â¸ÊýË¡/
--¤­¤ç¤¦¤¿¤¤ /¶©ÂÎ/ãþÂÎ/¶¸ÂÖ/¶ºÂÖ/ÕÈÂÖ/ä¡ÂÎ/
-+¤­¤ç¤¦¤¿¤¤ /ãþÂÎ/¶¸ÂÖ/ÕÈÂÖ/
- ¤­¤ç¤¦¤¿¤¤¤¤¤­ /¶¹ÂÓ°è/
--¤­¤ç¤¦¤¿¤¤¤¸¤Ã¤½¤¦¤®¤¸¤å¤Ä /¶©ÂμÂÁõµ»½Ñ/
-+¤­¤ç¤¦¤¿¤¤¤¸¤Ã¤½¤¦¤®¤¸¤å¤Ä /ãþÂμÂÁõµ»½Ñ/
- ¤­¤ç¤¦¤¿¤¯ /¶¡Â÷/¶µÂî/
- ¤­¤ç¤¦¤¿¤¯¤­¤ó /¶¡Â÷¶â/
- ¤­¤ç¤¦¤¿¤¯¤·¤ç /¶¡Â÷½ê/
-@@ -36904,7 +36904,7 @@
- ¤®¤¸¤ó¤Û¤¦ /µ¼¿ÍË¡/
- ¤®¤»¤¤ /µ¾À·/µ¼À¼/µ¼À©/
- ¤®¤»¤¤¤´ /µ¼À¼¸ì/
--¤®¤»¤¤¤·¤ã /µ·À·¼Ô/µ¾À·¼Ô/
-+¤®¤»¤¤¤·¤ã /µ¾À·¼Ô/
- ¤®¤»¤­ /µÄÀÊ/
- ¤®¤»¤­¤¹¤¦ /µÄÀÊ¿ô/
- ¤®¤»¤­¤Ï¤¤¤Ö¤ó /µÄÀÊÇÛʬ/
-@@ -42867,7 +42867,7 @@
- ¤³¤¦¤®¤»¤­¤Ö¤ó /¹­µÁÀÑʬ/
- ¤³¤¦¤®¤¿¤¤¤·¤ç¤¦ /¹³µÄÂоÝ/
- ¤³¤¦¤®¤Á¤å¤¦ /¹ÖµÁÃæ/
--¤³¤¦¤®¤È¤¦ /¹ÖµÁÅë/¹ÖµÁÅï/
-+¤³¤¦¤®¤È¤¦ /¹ÖµÁÅï/
- ¤³¤¦¤®¤Ê¤¤¤è¤¦ /¹ÖµÁÆâÍÆ/
- ¤³¤¦¤®¤Ö¤ó /¹³µÄʸ/
- ¤³¤¦¤®¤á¤¤ /¹ÖµÁ̾/
-@@ -84011,7 +84011,7 @@
- ¤È¤¦¤¸¤å¤¦¤í¤¦ /Æ£½½Ïº/
- ¤È¤¦¤¸¤æ¤¦¤á¤¤ /Åö»þͭ̾/
- ¤È¤¦¤¸¤ç /Åâ½ñ/
--¤È¤¦¤¸¤ç¤¦ /Åоì/Åë¾è/ÅìÛê/Åì¾ò/Åï¾å/Åì¾å/Åã¾è/Ƭ¾õ/Åì¾ë/Åû¾õ/
-+¤È¤¦¤¸¤ç¤¦ /Åоì/Åë¾è/ÅìÛê/Åì¾ò/Åï¾å/Åì¾å/Ƭ¾õ/Åì¾ë/Åû¾õ/
- ¤È¤¦¤¸¤ç¤¦¤¤¤¼¤ó /Åоì°ÊÁ°/
- ¤È¤¦¤¸¤ç¤¦¤¤¤é¤¤ /Åоì°ÊÍè/
- ¤È¤¦¤¸¤ç¤¦¤¤¤ó /Åë¾è°÷/
-@@ -84025,7 +84025,7 @@
- ¤È¤¦¤¸¤ç¤¦¤´ /Åоì¸å/
- ¤È¤¦¤¸¤ç¤¦¤·¤ã /Åë¾è¼Ô/
- ¤È¤¦¤¸¤ç¤¦¤·¤ã¤Û¤±¤ó /Åë¾è¼ÔÊݸ±/
--¤È¤¦¤¸¤ç¤¦¤¸ /Åã¾è»þ/Åоì»þ/
-+¤È¤¦¤¸¤ç¤¦¤¸ /Åë¾è»þ/Åоì»þ/
- ¤È¤¦¤¸¤ç¤¦¤¸¤Ã¤»¤­ /Åë¾è¼ÂÀÓ/
- ¤È¤¦¤¸¤ç¤¦¤¸¤ó¤Ö¤Ä /Åоì¿Íʪ/
- ¤È¤¦¤¸¤ç¤¦¤¸¤ó¤Ö¤Ä¤¿¤Á /Åоì¿Íʪã/
-@@ -84038,7 +84038,7 @@
- ¤È¤¦¤¸¤ç¤¦¤È¤¦¤¸ /ÅоìÅö»þ/
- ¤È¤¦¤¸¤ç¤¦¤Ð¤á¤ó /Åоì¾ìÌÌ/
- ¤È¤¦¤¸¤ç¤¦¤Ð¤ó¤°¤ß /ÅоìÈÖÁÈ/
--¤È¤¦¤¸¤ç¤¦¤Ó /Åã¾èÆü/Åë¾èÆü/
-+¤È¤¦¤¸¤ç¤¦¤Ó /Åë¾èÆü/
- ¤È¤¦¤¸¤ç¤¦¤Ó¤ó /Åë¾èÊØ/
- ¤È¤¦¤¸¤ç¤¦¤Þ¤¨ /ÅоìÁ°/Åë¾èÁ°/
- ¤È¤¦¤¸¤ç¤¦¤è¤Æ¤¤ /ÅоìͽÄê/Åë¾èͽÄê/
-@@ -93140,7 +93140,7 @@
- ¤Ï¤²¤¿¤« /ÆÅÂë/
- ¤Ï¤²¤ä¤Þ /ÆÅ»³/
- ¤Ï¤²¤ó /Çȸ»/
--¤Ï¤³ /È¢/È¡/±¿/ÍÕ»Ò/¢¢/¶©/Ñâ/ä¨/ý/Òº/
-+¤Ï¤³ /È¢/È¡/±¿/ÍÕ»Ò/¢¢/ãþ/Ñâ/ä¨/ý/Òº/
- ¤Ï¤³¤¤¤ê /È¢Æþ¤ê/È¢Æþ/
- ¤Ï¤³¤¦ /Ç˸ý/ìì¹Ô/Çȹâ/
- ¤Ï¤³¤¦¤Ö¤ó¤× /ÇȹâʬÉÛ/
diff --git a/japanese/texfamily-share/DESCR b/japanese/texfamily-share/DESCR
deleted file mode 100644
index af879dce089..00000000000
--- a/japanese/texfamily-share/DESCR
+++ /dev/null
@@ -1,19 +0,0 @@
-TeXfamily 1.2.1 is a correction of previous release 1.2 of TeX package with
-Japanese and other language, based on teTeX 1.0.7.
-
-NetBSD verion of this package contains several programs:
-
-1. Programs included with original TeXfamily
- - NTT JTeX 1.9.1 (Japanese TeX)
- - MuLTeX 0.8.1 (Multi-Lingual TeX)
-
-2. Tools for JTex/MuLTeX (available from TeXfamily's site)
- - dvi2ps-3.2j (dvi2ps with Japanese support)
- - jmakeindex (indexing tool with Japanese support)
-
-3. ASCII pTeX and tools for it
- - ASCII Publishing TeX (ptex) 2.1.10
- - dvipsk-p1.5d (dvips with Japanese support)
- - mendexk2.4f (indexing tool with Japanese support)
-
-This package is a machine-independent part.
diff --git a/japanese/texfamily-share/Makefile b/japanese/texfamily-share/Makefile
deleted file mode 100644
index 8e6287cf9d9..00000000000
--- a/japanese/texfamily-share/Makefile
+++ /dev/null
@@ -1,69 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2002/03/13 20:12:13 fredb Exp $
-
-DISTNAME= TeXfamily-share-1.2.1
-PKGREVISION= 2
-CATEGORIES= japanese
-MASTER_SITES= ftp://ftp.math.s.chiba-u.ac.jp/tex/texfam-1.2/ \
- ftp://ftp.math.s.chiba-u.ac.jp/tex/texfam-1.2.1/ \
- ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/tetex/ \
- ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/jvf/
-DISTFILES= ptex-texmf-1.10${EXTRACT_SUFX} \
- texfam-texmf-latex209${EXTRACT_SUFX} \
- texfam-texmf-j1.9${EXTRACT_SUFX} \
- texfam-texmf-j1.9.1${EXTRACT_SUFX} \
- texfam-texmf-m0.8${EXTRACT_SUFX} \
- mulfonts-vf${EXTRACT_SUFX} mulfonts-subtfm${EXTRACT_SUFX} \
- nmin-ngoth${EXTRACT_SUFX} standard${EXTRACT_SUFX} \
- morisawa${EXTRACT_SUFX}
-
-MAINTAINER= kei@netbsd.org
-COMMENT= Machine-independent part of TeXfamily (pTeX, JTeX, MuLTeX)
-
-DEPENDS+= teTeX>=1.0.7nb1:../../print/teTeX
-
-DIST_SUBDIR= TeXfamily
-WRKSRC= ${WRKDIR}
-EXTRACT_ONLY= nmin-ngoth${EXTRACT_SUFX} standard${EXTRACT_SUFX} \
- morisawa${EXTRACT_SUFX}
-NO_PATCH= yes
-NO_CONFIGURE= yes
-NO_BUILD= yes
-NO_MTREE= yes
-PLIST_SRC= ${WRKDIR}/PLIST_SRC
-
-do-install:
- @${INSTALL_DATA_DIR} ${LOCALBASE}/share/texmf.local
-.for f in ptex-texmf-1.10 texfam-texmf-latex209 texfam-texmf-j1.9 \
- texfam-texmf-j1.9.1 texfam-texmf-m0.8 \
- mulfonts-vf mulfonts-subtfm nmin-ngoth standard morisawa
- @${GTAR} -plzx -C ${LOCALBASE}/share/texmf.local \
- -f ${DISTDIR}/${DIST_SUBDIR}/${f}${EXTRACT_SUFX} \
- --exclude=ls-R
-.endfor
- @${INSTALL_DATA_DIR} ${LOCALBASE}/share/texmf.local/doc/fonts
- @${GTAR} Ccf ${WRKDIR}/morisawa/tfm/ptex - . | \
- ${GTAR} Cxf ${LOCALBASE}/share/texmf.local/fonts/tfm/ptex -
-.for font in nmin-ngoth standard morisawa
- @${GTAR} Ccf ${WRKDIR}/${font} - tfm/dvips vf | \
- ${GTAR} Cxf ${LOCALBASE}/share/texmf.local/fonts -
- @${INSTALL_DATA} ${WRKDIR}/${font}/README.txt \
- ${LOCALBASE}/share/texmf.local/doc/fonts/README.${font}
-.endfor
-
-post-install:
- @cd ${LOCALBASE}; \
- ${CAT} ${PKGDIR}/PLIST > ${PLIST_SRC}; \
- ${FIND} share/texmf.local -type f|sort >> ${PLIST_SRC}; \
- for LINK in `${FIND} share/texmf.local -type l`; do \
- set - X `${FILE} $$LINK`; \
- ${ECHO} "@exec ${LN} -s $$6 %D/$$LINK" >>${PLIST_SRC}; \
- ${ECHO} "@unexec ${RM} -f %D/$$LINK" >>${PLIST_SRC}; \
- done; \
- for DIR in `${FIND} share/texmf.local -type d | sort -r`; do \
- if [ -z "`ls $$DIR`" ]; then \
- ${ECHO} "@exec ${MKDIR} %D/$$DIR" >>${PLIST_SRC}; \
- fi; \
- ${ECHO} "@dirrm $$DIR" >>${PLIST_SRC}; \
- done
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/japanese/texfamily-share/PLIST b/japanese/texfamily-share/PLIST
deleted file mode 100644
index 3858ab92c47..00000000000
--- a/japanese/texfamily-share/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:29:41 zuntum Exp $
-@comment this plist intentionally left empty
diff --git a/japanese/texfamily-share/distinfo b/japanese/texfamily-share/distinfo
deleted file mode 100644
index 8dcc656ae9f..00000000000
--- a/japanese/texfamily-share/distinfo
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: distinfo,v 1.3 2001/10/24 00:29:34 kei Exp $
-
-SHA1 (TeXfamily/ptex-texmf-1.10.tar.gz) = 8ad1e8c5c30146af00329ab5148f43b8f6481489
-Size (TeXfamily/ptex-texmf-1.10.tar.gz) = 1861430 bytes
-SHA1 (TeXfamily/texfam-texmf-latex209.tar.gz) = b28b3f10701531514503d72c3c2609a63042db29
-Size (TeXfamily/texfam-texmf-latex209.tar.gz) = 204702 bytes
-SHA1 (TeXfamily/texfam-texmf-j1.9.tar.gz) = f563c0791a649e38624965ee27c8c400639041a8
-Size (TeXfamily/texfam-texmf-j1.9.tar.gz) = 212327 bytes
-SHA1 (TeXfamily/texfam-texmf-j1.9.1.tar.gz) = f0a166bdce7f5aaf244610ab60eaf6e9aef47c2d
-Size (TeXfamily/texfam-texmf-j1.9.1.tar.gz) = 57886 bytes
-SHA1 (TeXfamily/texfam-texmf-m0.8.tar.gz) = 7d80eec06277b0682f7315c26238b0f88a0057ab
-Size (TeXfamily/texfam-texmf-m0.8.tar.gz) = 76500 bytes
-SHA1 (TeXfamily/mulfonts-vf.tar.gz) = 12a83f6b7fa6388b1a7a2cf9438bb4f55d3efcd3
-Size (TeXfamily/mulfonts-vf.tar.gz) = 4300 bytes
-SHA1 (TeXfamily/mulfonts-subtfm.tar.gz) = c99f1783980df042d64f9492bb944463a8771a80
-Size (TeXfamily/mulfonts-subtfm.tar.gz) = 8019 bytes
-SHA1 (TeXfamily/nmin-ngoth.tar.gz) = 17f0169c92465c0ee7d704c8cc5eea75738d1a2b
-Size (TeXfamily/nmin-ngoth.tar.gz) = 522303 bytes
-SHA1 (TeXfamily/standard.tar.gz) = b447bbba89018460ec87b257d8a89a9ad2d9fc43
-Size (TeXfamily/standard.tar.gz) = 1041383 bytes
-SHA1 (TeXfamily/morisawa.tar.gz) = f865b0582813f9dddd10f7fc0730d486efef829c
-Size (TeXfamily/morisawa.tar.gz) = 651717 bytes
diff --git a/japanese/texfamily/DESCR b/japanese/texfamily/DESCR
deleted file mode 100644
index 90b27c20629..00000000000
--- a/japanese/texfamily/DESCR
+++ /dev/null
@@ -1,19 +0,0 @@
-TeXfamily 1.2.1 is a correction of previous release 1.2 of TeX package with
-Japanese and other language, based on teTeX 1.0.7.
-
-NetBSD version of this package contains several programs:
-
-1. Programs included with original TeXfamily
- - NTT JTeX 1.9.1 (Japanese TeX)
- - MuLTeX 0.8.1 (Multi-Lingual TeX)
-
-2. Tools for JTex/MuLTeX (available from TeXfamily's site)
- - dvi2ps-3.2j (dvi2ps with Japanese support)
- - jmakeindex (indexing tool with Japanese support)
-
-3. ASCII pTeX and tools for it
- - ASCII Publishing TeX (ptex) 2.1.10
- - dvipsk-p1.5e (dvips with Japanese support)
- - mendexk2.4f (indexing tool with Japanese support)
-
-This package contains executables.
diff --git a/japanese/texfamily/Makefile b/japanese/texfamily/Makefile
deleted file mode 100644
index 407da0c5bec..00000000000
--- a/japanese/texfamily/Makefile
+++ /dev/null
@@ -1,163 +0,0 @@
-# $NetBSD: Makefile,v 1.9 2002/03/13 20:12:12 fredb Exp $
-
-DISTNAME= TeXfamily-1.2.1
-PKGREVISION= 2
-CATEGORIES= japanese
-MASTER_SITES= ftp://ftp.math.s.chiba-u.ac.jp/tex/texfam-1.2/ \
- ftp://ftp.math.s.chiba-u.ac.jp/tex/texfam-1.2.1/ \
- ftp://ftp.math.s.chiba-u.ac.jp/tex/ \
- ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/tetex/ \
- ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/dvips/ \
- ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/mendex/
-DISTFILES= texfam-1.2${EXTRACT_SUFX} \
- web2c-j1.9${EXTRACT_SUFX} \
- web2c-j1.9.1${EXTRACT_SUFX} \
- web2c-m0.8${EXTRACT_SUFX} \
- web2c-m0.8.1${EXTRACT_SUFX} \
- dvi2ps-3.2j${EXTRACT_SUFX} \
- jmakeindex${EXTRACT_SUFX} \
- ptex-src-2.1.10${EXTRACT_SUFX} \
- dvipsk-jpatch-p1.5e${EXTRACT_SUFX} \
- mendexk2.4f${EXTRACT_SUFX}
-
-PATCH_SITES= ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/tetex/
-PATCHFILES= ptex2.1.10-11.patch
-PATCH_DIST_ARGS= -d ${WRKSRC}/texk/web2c/ptex-src-2.1.10
-
-MAINTAINER= kei@netbsd.org
-COMMENT= TeXfamily (pTeX, JTeX, MuLTeX) - executables
-
-DEPENDS+= TeXfamily-share>=1.2.1nb2:../../japanese/texfamily-share
-DEPENDS+= ja-vflib-lib-[0-9]*:../../japanese/vflib-lib
-
-DIST_SUBDIR= TeXfamily
-TETEX_DIR= ${_PKGSRCDIR}/print/teTeX-bin/${WRKDIR:T}/teTeX-1.0
-WRKSRC= ${TETEX_DIR}
-EXTRACT_ONLY= # none
-
-ALL_TARGET= all
-INSTALL_TARGET= install strip
-USE_GMAKE= yes
-USE_X11= yes
-PLIST_SUBST+= MV="${MV}"
-CFLAGS+= -Dunix
-MAKEFLAGS+= PREFIX=${PREFIX}
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+=--prefix=${PREFIX} \
- --enable-local-texmf=texmf.local \
- --without-texinfo \
- --without-dialog \
- --disable-multiplatform \
- --enable-ipc \
- --with-epsfwin \
- --with-hp2627win \
- --with-mftalkwin \
- --with-x11 \
- --with-libwww-config=${LOCALBASE}/bin/libwww-config \
- --with-system-pnglib \
- --with-pnglib-libdir=${LOCALBASE}/lib \
- --with-pnglib-include=${LOCALBASE}/include \
- --with-system-zlib
-.include "../../mk/bsd.prefs.mk"
-.if defined(PAPERSIZE) && ${PAPERSIZE} == "A4"
-CONFIGURE_ARGS+=--enable-a4
-.endif
-
-.if ${OPSYS} != "SunOS"
-CONFIGURE_ARGS+=--enable-auto-core \
- --with-zlib-libdir=/usr/lib \
- --with-zlib-include=/usr/include
-.else
-CONFIGURE_ARGS+= --with-zlib-libdir=${LOCALBASE}/lib \
- --with-zlib-include=${LOCALBASE}/include
-.endif
-
-CONFIGURE_ENV+= INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
- INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
- INSTALL_DATA="${INSTALL_DATA}"
-
-pre-extract:
- if [ ! -e ${WRKSRC} ]; then \
- cd ../../print/teTeX-bin && ${MAKE} patch; \
- elif [ ! -e ${WRKSRC}/texk/texfam.ac ]; then \
- cd ../../print/teTeX-bin && ${MAKE} clean; ${MAKE} patch; \
- fi
-
-post-extract:
- ${GTAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/texfam-1.2${EXTRACT_SUFX} \
- -C ${WRKSRC}/..
- ${GTAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/web2c-j1.9${EXTRACT_SUFX} \
- -C ${WRKSRC}/texk
- ${GTAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/web2c-j1.9.1${EXTRACT_SUFX} \
- -C ${WRKSRC}/texk
- ${GTAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/web2c-m0.8${EXTRACT_SUFX} \
- -C ${WRKSRC}/texk
- ${GTAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/web2c-m0.8.1${EXTRACT_SUFX} \
- -C ${WRKSRC}/texk
- ${GTAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/ptex-src-2.1.10${EXTRACT_SUFX} \
- -C ${WRKSRC}/texk/web2c
- ${GTAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/dvi2ps-3.2j${EXTRACT_SUFX} \
- -C ${WRKSRC}/texk
- ${GTAR} -xzf \
- ${DISTDIR}/${DIST_SUBDIR}/dvipsk-jpatch-p1.5e${EXTRACT_SUFX} \
- -C ${WRKDIR}
- ${GTAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/mendexk2.4f${EXTRACT_SUFX} \
- -C ${WRKSRC}/texk
- ${GTAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/jmakeindex${EXTRACT_SUFX} \
- -C ${WRKSRC}/texk
- ${SED} -e "s|\$TEXMF/ptex/plain/||" \
- ${LOCALBASE}/share/texmf.local/ptex/plain/base/ptex.tex > \
- ${WRKSRC}/texk/web2c/ptex-src-2.1.10/ptex.tex
- ${RM} -f ${WRKSRC}/texmf ${WRKSRC}/texmf.local
- ${LN} -s ${LOCALBASE}/share/texmf ${WRKSRC}
- ${LN} -s ${LOCALBASE}/share/texmf.local ${WRKSRC}
-
-pre-patch:
- ${PATCH} -d ${WRKSRC}/texk/dvipsk --quiet -E -p1 < \
- ${WRKDIR}/dvipsk586.patch
-
-post-patch:
- ${MV} ${WRKSRC}/texk/kpathsea/texmf.in \
- ${WRKSRC}/texk/kpathsea/texmf.in.orig
- ${SED} -e 's,@TEXMFSITE@,${TEXMFSITE},' \
- ${WRKSRC}/texk/kpathsea/texmf.in.orig > \
- ${WRKSRC}/texk/kpathsea/texmf.in
-
-post-configure:
- (cd ${WRKSRC}/texk/web2c/ptex-src-2.1.10; \
- ./configure EUC ${LOCALBASE}/share/texmf.local)
-
-do-build:
- (cd ${WRKSRC}/texk/web2c; ${GMAKE})
- (cd ${WRKSRC}/texk/web2c-j; ${GMAKE})
- (cd ${WRKSRC}/texk/web2c-m; ${GMAKE})
- (cd ${WRKSRC}/texk/web2c/ptex-src-2.1.10; ${GMAKE})
- (cd ${WRKSRC}/texk/dvi2ps-3.2j; ${GMAKE} ${MAKEFLAGS} all newlib)
- (cd ${WRKSRC}/texk/dvipsk; ${GMAKE})
- (cd ${WRKSRC}/texk/mendexk2.4f; ${GMAKE})
- (cd ${WRKSRC}/texk/jmakeindex/src; ${MAKE} -f makefile.unx)
-
-do-install:
- (cd ${WRKSRC}/texk/web2c-j; ${GMAKE} install)
- (cd ${WRKSRC}/texk/web2c-m; ${GMAKE} install)
- (cd ${WRKSRC}/texk/web2c/ptex-src-2.1.10; ${GMAKE} install)
- (cd ${WRKSRC}/texk/dvi2ps-3.2j; \
- ${GMAKE} install install-lib install-MakePK install-lprdvi)
- (cd ${WRKSRC}/texk/dvi2ps-3.2j; ${GMAKE} install install-man)
- ${INSTALL_DATA_DIR} ${LOCALBASE}/share/texmf.local/doc/dvi2ps
- ${INSTALL_DATA} ${WRKSRC}/texk/dvi2ps-3.2j/doc/* \
- ${LOCALBASE}/share/texmf.local/doc/dvi2ps
- (cd ${WRKSRC}/texk/dvipsk; \
- ${SETENV} texmflcl=${LOCALBASE}/share/texmf.local \
- ${GMAKE} install)
- ${INSTALL_PROGRAM} ${WRKSRC}/texk/mendexk2.4f/mendex ${PREFIX}/bin
- ${INSTALL_PROGRAM} ${WRKSRC}/texk/jmakeindex/src/jmakeindex \
- ${PREFIX}/bin
-
-post-install:
- mktexlsr ${LOCALBASE}/share/texmf.local
-
-pre-clean:
- cd ../../print/teTeX-bin && ${MAKE} clean
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/japanese/texfamily/PLIST b/japanese/texfamily/PLIST
deleted file mode 100644
index 47c152b20b3..00000000000
--- a/japanese/texfamily/PLIST
+++ /dev/null
@@ -1,183 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2002/01/14 18:06:55 wiz Exp $
-bin/MakePK
-bin/dvi2ps
-bin/inijtex
-bin/inimultex
-bin/iniptex
-bin/jbibtex
-bin/jmakeindex
-bin/jlatex
-bin/jlatex209
-bin/jtex
-bin/lprdvi
-bin/mendex
-bin/mullatex
-bin/multex
-bin/pdvips
-bin/pdvitype
-bin/pjbibtex
-bin/platex
-bin/ppltotf
-bin/ptex
-bin/ptftopl
-bin/virjtex
-bin/virmultex
-bin/virptex
-man/man1/dvi2ps.1
-man/ja_JP.EUC/man1/dvi2ps.1
-share/texmf.local/doc/dvi2ps/DOCS
-share/texmf.local/doc/dvi2ps/QandA
-share/texmf.local/doc/dvi2ps/bugs.doc
-share/texmf.local/doc/dvi2ps/changes.doc
-share/texmf.local/doc/dvi2ps/dvi2ps.doc
-share/texmf.local/doc/dvi2ps/fontdesc.doc
-share/texmf.local/doc/dvi2ps/hints.doc
-share/texmf.local/doc/dvi2ps/history
-share/texmf.local/doc/dvi2ps/install.doc
-share/texmf.local/doc/dvi2ps/kanji.doc
-share/texmf.local/doc/dvi2ps/lib.doc
-share/texmf.local/doc/dvi2ps/local.mf
-share/texmf.local/doc/dvi2ps/lprdvi.doc
-share/texmf.local/doc/dvi2ps/metafont.doc
-share/texmf.local/doc/dvi2ps/nup.doc
-share/texmf.local/doc/dvi2ps/printers.doc
-share/texmf.local/doc/dvi2ps/psfiles.doc
-share/texmf.local/doc/dvi2ps/psfonts.doc
-share/texmf.local/doc/dvi2ps/report.doc
-share/texmf.local/doc/dvi2ps/special.doc
-share/texmf.local/doc/dvi2ps/texfix.doc
-share/texmf.local/doc/dvi2ps/vfontcap.add
-share/texmf.local/doc/dvi2ps/vfref.doc
-share/texmf.local/dvi2ps/LW16-600J
-share/texmf.local/dvi2ps/LWIINTX-J
-share/texmf.local/dvi2ps/RicohSP10
-share/texmf.local/dvi2ps/SPARCptr
-share/texmf.local/dvi2ps/bifont
-share/texmf.local/dvi2ps/bikanji
-share/texmf.local/dvi2ps/bikant1
-share/texmf.local/dvi2ps/bitbk
-share/texmf.local/dvi2ps/bitmap
-share/texmf.local/dvi2ps/bmbi
-share/texmf.local/dvi2ps/bothside.ps
-share/texmf.local/dvi2ps/config
-share/texmf.local/dvi2ps/configk
-share/texmf.local/dvi2ps/defaulttray.ps
-share/texmf.local/dvi2ps/dvi2.ps
-share/texmf.local/dvi2ps/dvips.ps
-share/texmf.local/dvi2ps/fonts/a2n
-share/texmf.local/dvi2ps/fonts/asc-bikanji
-share/texmf.local/dvi2ps/fonts/asc-bitmap
-share/texmf.local/dvi2ps/fonts/asc-wada
-share/texmf.local/dvi2ps/fonts/asc-wadaz
-share/texmf.local/dvi2ps/fonts/bikan-mor2
-share/texmf.local/dvi2ps/fonts/bikan-rsp
-share/texmf.local/dvi2ps/fonts/bikan-wada
-share/texmf.local/dvi2ps/fonts/bikan-wadaz
-share/texmf.local/dvi2ps/fonts/fonts-bitmap
-share/texmf.local/dvi2ps/fonts/fonts-t1
-share/texmf.local/dvi2ps/fonts/generate
-share/texmf.local/dvi2ps/fonts/mul-bikanji
-share/texmf.local/dvi2ps/fonts/mul-bitmap
-share/texmf.local/dvi2ps/fonts/muldecomp
-share/texmf.local/dvi2ps/fonts/n2a
-share/texmf.local/dvi2ps/fonts/ntt-bikanji
-share/texmf.local/dvi2ps/fonts/ntt-bitmap
-share/texmf.local/dvi2ps/fonts/ntt-wada
-share/texmf.local/dvi2ps/fonts/ntt-wadaz
-share/texmf.local/dvi2ps/fonts/nttdecomp
-share/texmf.local/dvi2ps/fonts/psfonts
-share/texmf.local/dvi2ps/fonts/psfonts-0
-share/texmf.local/dvi2ps/fonts/psfonts-0.map
-share/texmf.local/dvi2ps/fonts/psfonts-8r
-share/texmf.local/dvi2ps/fonts/psfonts-8r.map
-share/texmf.local/dvi2ps/fonts/psfonts-misc.map
-share/texmf.local/dvi2ps/fonts/psfonts-std
-share/texmf.local/dvi2ps/fonts/psfonts-std.map
-share/texmf.local/dvi2ps/fonts/psfonts.ps
-share/texmf.local/dvi2ps/fonts/t1ams.map
-share/texmf.local/dvi2ps/fonts/t1cm.map
-share/texmf.local/dvi2ps/fonts/vtex
-share/texmf.local/dvi2ps/fonts/vtex.ps
-share/texmf.local/dvi2ps/fontsk/a2n
-share/texmf.local/dvi2ps/fontsk/asc-bikanji
-share/texmf.local/dvi2ps/fontsk/asc-bitmap
-share/texmf.local/dvi2ps/fontsk/asc-wada
-share/texmf.local/dvi2ps/fontsk/asc-wadaz
-share/texmf.local/dvi2ps/fontsk/bikan-mor2
-share/texmf.local/dvi2ps/fontsk/bikan-rsp
-share/texmf.local/dvi2ps/fontsk/bikan-wada
-share/texmf.local/dvi2ps/fontsk/bikan-wadaz
-share/texmf.local/dvi2ps/fontsk/fonts-bitmap
-share/texmf.local/dvi2ps/fontsk/fonts-t1
-share/texmf.local/dvi2ps/fontsk/generate
-share/texmf.local/dvi2ps/fontsk/mul-bikanji
-share/texmf.local/dvi2ps/fontsk/mul-bitmap
-share/texmf.local/dvi2ps/fontsk/muldecomp
-share/texmf.local/dvi2ps/fontsk/n2a
-share/texmf.local/dvi2ps/fontsk/ntt-bikanji
-share/texmf.local/dvi2ps/fontsk/ntt-bitmap
-share/texmf.local/dvi2ps/fontsk/ntt-wada
-share/texmf.local/dvi2ps/fontsk/ntt-wadaz
-share/texmf.local/dvi2ps/fontsk/nttdecomp
-share/texmf.local/dvi2ps/fontsk/psfonts
-share/texmf.local/dvi2ps/fontsk/psfonts-0
-share/texmf.local/dvi2ps/fontsk/psfonts-0.map
-share/texmf.local/dvi2ps/fontsk/psfonts-8r
-share/texmf.local/dvi2ps/fontsk/psfonts-8r.map
-share/texmf.local/dvi2ps/fontsk/psfonts-misc.map
-share/texmf.local/dvi2ps/fontsk/psfonts-std
-share/texmf.local/dvi2ps/fontsk/psfonts-std.map
-share/texmf.local/dvi2ps/fontsk/psfonts.ps
-share/texmf.local/dvi2ps/fontsk/t1ams.map
-share/texmf.local/dvi2ps/fontsk/t1ams0.map
-share/texmf.local/dvi2ps/fontsk/t1cm.map
-share/texmf.local/dvi2ps/fontsk/vtex
-share/texmf.local/dvi2ps/fontsk/vtex.ps
-share/texmf.local/dvi2ps/header
-share/texmf.local/dvi2ps/headers/color.ps
-share/texmf.local/dvi2ps/headers/dvi2.ps
-share/texmf.local/dvi2ps/headers/psifont.ps
-share/texmf.local/dvi2ps/headers/special.ps
-share/texmf.local/dvi2ps/macfix.ps
-share/texmf.local/dvi2ps/multex
-share/texmf.local/dvi2ps/old
-share/texmf.local/dvi2ps/oldfix.ps
-share/texmf.local/dvi2ps/printer/LW16
-share/texmf.local/dvi2ps/printer/LWII
-share/texmf.local/dvi2ps/printer/RicohSP10
-share/texmf.local/dvi2ps/printer/SPARC
-share/texmf.local/dvi2ps/tombo.ps
-share/texmf.local/dvi2ps/tumble.ps
-share/texmf.local/dvi2ps/vtexe
-share/texmf.local/dvi2ps/wadalab
-share/texmf.local/dvi2ps/wadalabz
-share/texmf.local/dvips/base/color.pro
-share/texmf.local/dvips/base/crop.pro
-share/texmf.local/dvips/base/finclude.pro
-share/texmf.local/dvips/base/hps.pro
-share/texmf.local/dvips/base/psfonts.map
-share/texmf.local/dvips/base/special.pro
-share/texmf.local/dvips/base/tex.pro
-share/texmf.local/dvips/base/texc.pro
-share/texmf.local/dvips/base/texps.pro
-share/texmf.local/ls-R
-share/texmf.local/web2c/jlatex.fmt
-share/texmf.local/web2c/jlatex209.fmt
-share/texmf.local/web2c/jtex.fmt
-share/texmf.local/web2c/jtex.pool
-share/texmf.local/web2c/mullatex.fmt
-share/texmf.local/web2c/multex.fmt
-share/texmf.local/web2c/multex.pool
-share/texmf.local/web2c/platex.fmt
-share/texmf.local/web2c/ptex.fmt
-share/texmf.local/web2c/ptex.pool
-share/texmf.local/web2c/texmf.cnf
-@dirrm share/texmf.local/web2c
-@dirrm share/texmf.local/dvips/base
-@dirrm share/texmf.local/dvips
-@dirrm share/texmf.local/dvi2ps/printer
-@dirrm share/texmf.local/dvi2ps/headers
-@dirrm share/texmf.local/dvi2ps/fontsk
-@dirrm share/texmf.local/dvi2ps/fonts
-@dirrm share/texmf.local/dvi2ps
-@dirrm share/texmf.local/doc/dvi2ps
diff --git a/japanese/texfamily/distinfo b/japanese/texfamily/distinfo
deleted file mode 100644
index 70d59d71e49..00000000000
--- a/japanese/texfamily/distinfo
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: distinfo,v 1.7 2002/01/14 18:07:28 wiz Exp $
-
-SHA1 (TeXfamily/texfam-1.2.tar.gz) = 510ef7048c1353a75d84d548738e8e2a94d83be9
-Size (TeXfamily/texfam-1.2.tar.gz) = 154286 bytes
-SHA1 (TeXfamily/web2c-j1.9.tar.gz) = 1fd7c3fbcc81fe82935a86259bb382ae20ad6742
-Size (TeXfamily/web2c-j1.9.tar.gz) = 195277 bytes
-SHA1 (TeXfamily/web2c-j1.9.1.tar.gz) = 088b24d04c487e1815e2de07d9dd4d637fbc33a2
-Size (TeXfamily/web2c-j1.9.1.tar.gz) = 86610 bytes
-SHA1 (TeXfamily/web2c-m0.8.tar.gz) = c9c48ea58f856831178ea362918696b71bea9f95
-Size (TeXfamily/web2c-m0.8.tar.gz) = 153807 bytes
-SHA1 (TeXfamily/web2c-m0.8.1.tar.gz) = 6131a4642299334c91e75f53f16393c50296be93
-Size (TeXfamily/web2c-m0.8.1.tar.gz) = 85513 bytes
-SHA1 (TeXfamily/dvi2ps-3.2j.tar.gz) = 3f055f7388ebe9f9bf873374eda7c612462207fe
-Size (TeXfamily/dvi2ps-3.2j.tar.gz) = 171083 bytes
-SHA1 (TeXfamily/jmakeindex.tar.gz) = 14e68b3cbd0f80ae383b540a5391d8ccecc4ba57
-Size (TeXfamily/jmakeindex.tar.gz) = 283656 bytes
-SHA1 (TeXfamily/ptex-src-2.1.10.tar.gz) = d5d1cfe0f56d9b4bcd660486d1af8923bc935426
-Size (TeXfamily/ptex-src-2.1.10.tar.gz) = 132496 bytes
-SHA1 (TeXfamily/dvipsk-jpatch-p1.5e.tar.gz) = 568bb4ed176603f43e3f5f0c25c6ff778d093399
-Size (TeXfamily/dvipsk-jpatch-p1.5e.tar.gz) = 23009 bytes
-SHA1 (TeXfamily/mendexk2.4f.tar.gz) = aa65a16a2bc965877fb19e8798ee80790917c588
-Size (TeXfamily/mendexk2.4f.tar.gz) = 22371 bytes
-SHA1 (TeXfamily/ptex2.1.10-11.patch) = 8fcef65143761e1862d9e9c80f98a2e5211f57b0
-Size (TeXfamily/ptex2.1.10-11.patch) = 4430 bytes
-SHA1 (patch-aa) = dfc441babfff2fefee43dd38a6f1393859f1d370
-SHA1 (patch-ab) = 6dc92be09afbce61d62468873c21add1564ac02c
-SHA1 (patch-ac) = eeb266e3fc5a6b646ffc498c08107a9dd76c6660
-SHA1 (patch-ad) = 3292baba0f31f191c13a12dd3cd39e8bd2e091f7
-SHA1 (patch-ae) = 644182534b6001d167b45b25378c33873563ef61
-SHA1 (patch-af) = 999a897d77004503253e7f443e9108d969a4ad11
-SHA1 (patch-ag) = fcd691409227e6025ffc52c23df5a82ab23bf0c3
-SHA1 (patch-ah) = 08b0d94c7347693da7fe024eb0ab81916a598529
-SHA1 (patch-ai) = 9f62fe1d16f4004997718fbc7b6f9ad3bef607c6
-SHA1 (patch-aj) = 16eee3e2af7f4fc02c8da9577dc363cd271b8bc3
diff --git a/japanese/texfamily/patches/patch-aa b/japanese/texfamily/patches/patch-aa
deleted file mode 100644
index 5df078d9a72..00000000000
--- a/japanese/texfamily/patches/patch-aa
+++ /dev/null
@@ -1,116 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2001/10/24 00:29:31 kei Exp $
-
---- texk/web2c/ptex-src-2.1.10/Makefile.in.orig Thu Feb 8 17:56:34 2001
-+++ texk/web2c/ptex-src-2.1.10/Makefile.in Tue Oct 23 14:47:40 2001
-@@ -4,10 +4,15 @@
-
- default: programs formats
-
--programs=ptex tftopl pltotf pdvitype jbibtex
-+programs=ptex ptftopl ppltotf pdvitype pjbibtex
- formats=ptex.fmt platex.fmt
-
- ac_include ../../make/paths.mk
-+#
-+texmflcl = @texmflocal@
-+web2c_lcl_dir = $(texmflcl)/web2c
-+fmt_lcl_dir = $(web2c_lcl_dir)
-+texpool_lcl_dir = $(web2c_lcl_dir)
-
- # Used for triptrap.
- DIFF = diff
-@@ -105,6 +110,9 @@
- fi
-
- ### TFtoPL
-+ptftopl: tftopl
-+ rm -f ptftopl
-+ $(LN) tftopl ptftopl
- tftopl: tftopl.o $(plib_o) $(kpathsea) $(proglib)
- $(kpathsea_link) tftopl.o $(plib_o) $(LOADLIBES)
- tftopl.o: tftopl.c kanji.h maintain.h ptexhelp.h
-@@ -115,6 +123,9 @@
- $(srcdir)/tie -m tftopl.web $(srcdir)/tftopl.web $(srcdir)/tftopl.ch
-
- ### PLtoTF
-+ppltotf: pltotf
-+ rm -f ppltotf
-+ $(LN) pltotf ppltotf
- pltotf: pltotf.o $(plib_o) $(kpathsea) $(proglib)
- $(kpathsea_link) pltotf.o $(plib_o) $(LOADLIBES)
- pltotf.o: pltotf.c kanji.h maintain.h ptexhelp.h
-@@ -135,6 +146,9 @@
- $(LN) $(srcdir)/dvitype.web pdvitype.web
-
- ### jBibTeX
-+pjbibtex: jbibtex
-+ rm -f pjbibtex
-+ $(LN) jbibtex pjbibtex
- jbibtex: jbibtex.o jbibextra.o $(plib_o) $(kpathsea) $(proglib)
- $(kpathsea_link) jbibtex.o jbibextra.o $(plib_o) $(LOADLIBES)
- jbibtex.o: jbibtex.c jbibextra.h kanji.h maintain.h ptexhelp.h
-@@ -175,7 +189,12 @@
- texmf.cnf: $(kpathsea_dir)/texmf.cnf
- $(SHELL) $(thisdir)/mkconf $< > texmf.cnf
-
--dumpenv = TEXMFCNF=$(thisdir) TEXMF=$(texmf)
-+#dumpenv = TEXMFCNF=$(thisdir) TEXMF=$(texmf)
-+newtexmf = $(srcdir)/../../texmf
-+newtexmflcl = $(srcdir)/../../texmf.local
-+texin = $(srcdir):{$(newtexmf),$(newtexmflcl)}/ptex//
-+texfonts = {$(newtexmf),$(newtexmflcl)}/fonts/tfm/ptex//
-+dumpenv = TEXMFCNF=../../kpathsea TEXINPUTS=.:$(texin): TEXFONTS=$(texfonts):
-
- ptex.fmt: ptex texmf.cnf
- $(dumpenv) $(MAKE) $(makeargs) files="--progname=ptex ptex.tex min10.tfm" prereq-check
-@@ -183,7 +202,7 @@
-
- platex.fmt: ptex texmf.cnf
- $(dumpenv) $(MAKE) $(makeargs) files="--progname=platex platex.ltx" prereq-check
-- $(dumpenv) ./ptex -ini --progname=platex \\input platex.ltx </dev/null
-+ $(dumpenv) ./ptex -ini --progname=platex \\input platex.ltx </dev/null || ${TRUE}
-
- # This is meant to be called recursively, with $(files) set.
- prereq-check: $(kpathsea_dir)/kpsewhich
-@@ -212,31 +231,31 @@
-
- # The actual binary executables and pool files.
- install-programs: $(programs)
-- $(SHELL) $(top_srcdir)/mkinstalldirs $(bindir) $(texpooldir)
-+ $(SHELL) $(top_srcdir)/mkinstalldirs $(bindir) $(texpool_lcl_dir)
- for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $(bindir) $$p; done
-
- # The links to ptex for each format and for {ini,vir}ptex.
- install-links: install-programs
- cd $(bindir) && \
-- (rm -f iniptex virptex; $(LN) ptex iniptex; $(LN) ptex virptex)
-+ (rm -f iniptex virptex platex; $(LN) ptex iniptex; $(LN) ptex virptex; $(LN) ptex platex)
-
- # Always do plain.*, so examples from the TeXbook (etc.) will work.
- install-formats: $(formats)
-- $(SHELL) $(top_srcdir)/mkinstalldirs $(fmtdir)
-- for f in $(formats); do $(INSTALL_DATA) $$f $(fmtdir)/$$f; done
-+ $(SHELL) $(top_srcdir)/mkinstalldirs $(fmt_lcl_dir)
-+ for f in $(formats); do $(INSTALL_DATA) $$f $(fmt_lcl_dir)/$$f; done
-
- # Auxiliary files.
- install-data::
- $(SHELL) $(top_srcdir)/mkinstalldirs \
-- $(texpooldir) $(web2cdir) $(fontnamedir)
-- $(INSTALL_DATA) ptex.pool $(texpooldir)/ptex.pool
-- if [ -f $(web2cdir)/texmf.cnf ]; then \
-- mv -f $(web2cdir)/texmf.cnf $(web2cdir)/texmf.cnf.orig ;\
-+ $(texpool_lcl_dir) $(web2c_lcl_dir) $(fontnamedir)
-+ $(INSTALL_DATA) ptex.pool $(texpool_lcl_dir)/ptex.pool
-+ if [ -f $(web2c_lcl_dir)/texmf.cnf ]; then \
-+ mv -f $(web2c_lcl_dir)/texmf.cnf $(web2c_lcl_dir)/texmf.cnf.orig ;\
- else true; fi
-- $(INSTALL_DATA) texmf.cnf $(web2cdir)/texmf.cnf
-+ $(INSTALL_DATA) texmf.cnf $(web2c_lcl_dir)/texmf.cnf
- # tcx files
- # cd $(thisdir)/share && \
--# for f in *.tcx; do $(INSTALL_DATA) $$f $(web2cdir)/$$f; done
-+# for f in *.tcx; do $(INSTALL_DATA) $$f $(web2c_lcl_dir)/$$f; done
- # map files are not provided with pTeX
- # cd $(thisdir)/share && \
- # for f in *.map; do $(INSTALL_DATA) $$f $(fontnamedir)/$$f; done
diff --git a/japanese/texfamily/patches/patch-ab b/japanese/texfamily/patches/patch-ab
deleted file mode 100644
index ea1d89f1b1a..00000000000
--- a/japanese/texfamily/patches/patch-ab
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/04/14 12:58:56 kei Exp $
-
---- texk/web2c/ptex-src-2.1.10/configure.orig Tue Feb 29 15:25:45 2000
-+++ texk/web2c/ptex-src-2.1.10/configure Tue May 2 19:23:40 2000
-@@ -6,5 +6,5 @@
-
- printUsage () {
-- echo "Usage: $progname {EUC|JIS|SJIS}"
-+ echo "Usage: $progname {EUC|JIS|SJIS} texmf_local_dir"
- exit 1
- }
-@@ -37,4 +37,4 @@
- export CONFIG_FILES CONFIG_HEADERS
- ../config.status
--sed -e "s/@kanjicode@/$kanjicode/" Makefile > $$ && mv -f $$ Makefile
-+sed -e "s/@kanjicode@/$kanjicode/" -e "s|@texmflocal@|$2|" Makefile > $$ && mv -f $$ Makefile
- exit 0
diff --git a/japanese/texfamily/patches/patch-ac b/japanese/texfamily/patches/patch-ac
deleted file mode 100644
index 11edd0ffe87..00000000000
--- a/japanese/texfamily/patches/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2001/04/14 12:58:56 kei Exp $
-
---- texk/make/paths.mk.orig Mon Jan 11 00:42:53 1999
-+++ texk/make/paths.mk Wed May 3 03:48:36 2000
-@@ -47,5 +47,5 @@
-
- # The directory used by varfonts.
--vartexfonts = /var/tmp/texfonts
-+vartexfonts = /var/spool/texfonts
-
- # Regular input files.
diff --git a/japanese/texfamily/patches/patch-ad b/japanese/texfamily/patches/patch-ad
deleted file mode 100644
index ff1af198203..00000000000
--- a/japanese/texfamily/patches/patch-ad
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2001/04/14 12:58:56 kei Exp $
-
---- texk/dvipsk/Makefile.in.orig Sat May 6 03:23:01 2000
-+++ texk/dvipsk/Makefile.in Sat May 6 03:52:33 2000
-@@ -19,4 +19,5 @@
- ac_include ../make/texi.mk
- prog_cflags = -DUNIX -DKPATHSEA -DNeedFunctionPrototypes -DSHIFTLOWCHARS
-+psheaderdir = $(texmflcl)/dvips
-
- # The `t[mp]-' business is so that we don't create an empty .pro file,
-@@ -37,5 +38,5 @@
-
- program = dvips
--programs = afm2tfm $(program)
-+programs = pdvips
-
-
-@@ -44,4 +45,7 @@
- $(program): $(kpathsea) $(objects)
- $(kpathsea_link) $(objects) $(LOADLIBES)
-+pdvips: $(program)
-+ rm -f pdvips
-+ ln $(program) pdvips
- afm2tfm: $(kpathsea) afm2tfm.o
- $(kpathsea_link) afm2tfm.o $(LOADLIBES)
-@@ -82,6 +86,4 @@
- # PostScript prologues and encodings.
- for h in $(prologues); do $(INSTALL_DATA) $$h $(psheaderdir)/base/$$h; done
-- cd $(srcdir)/reencode && \
-- for e in *.enc; do $(INSTALL_DATA) $$e $(psheaderdir)/base/$$e; done
- # config.ps. Any one config.ps will be wrong for most people, so don't
- # install anything by default.
-@@ -97,4 +99,6 @@
- $(INSTALL_DATA) $(srcdir)/psfonts.map $(psheaderdir)/base/psfonts.map; \
- else true; fi
-+
-+_installed:
- # Info files.
- cd $(srcdir) && for i in $(program).i*; do \
diff --git a/japanese/texfamily/patches/patch-ae b/japanese/texfamily/patches/patch-ae
deleted file mode 100644
index e65588898f6..00000000000
--- a/japanese/texfamily/patches/patch-ae
+++ /dev/null
@@ -1,63 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2002/01/14 18:07:28 wiz Exp $
-
---- texk/dvi2ps-3.2j/Makefile.orig Mon Sep 11 18:16:11 2000
-+++ texk/dvi2ps-3.2j/Makefile
-@@ -2,16 +2,17 @@
- # your site:
- #
- # BINAREA and DVI2LIB are relative to PREFIX
--PREFIX=${DESTDIR}/usr/local
-+#PREFIX=${DESTDIR}/usr/local
- # where dvi2ps is installed
- BINAREA=${PREFIX}/bin
- #
- # directory for dvi2ps: where the auxiliary files are installed
--DVI2LIB=${PREFIX}/lib/dvi2ps
-+DVI2LIB=${PREFIX}/share/texmf.local/dvi2ps
- #
- # directory for man and doc
- MANAREA=${PREFIX}/man
--JMANAREA=${PREFIX}/man/ja
-+JMANAREA=${PREFIX}/man/ja_JP.EUC
-+# XXX above should be ja_JP.eucJP.
- DOCAREA=${PREFIX}/doc/dvi2ps
- #
- # name of default fontdesc file in your site
-@@ -45,19 +46,19 @@
- FONTF = -DFREETYPE -DVFLIB
- # FREETYPE -- FTLIB, FTINC
- # VFLIB -- FTLIB, FTINC, VFLIB, VFLIBINC
--FTLIB = -L${PREFIX}/lib -lttf
-+FTLIB = -R${PREFIX}/lib -L${PREFIX}/lib -lttf
- FTINC = -I${PREFIX}/include/freetype
--VFLIB = -L${PREFIX}/lib -lVFlib2
-+VFLIB = -R${PREFIX}/lib -L${PREFIX}/lib -lVFlib2 -lttf -lintl
- VFLIBINC = -I${PREFIX}/include
-
- # kpathsea
--KPSELIB = -L${PREFIX}/lib -lkpathsea
-+KPSELIB = -R${PREFIX}/lib -L${PREFIX}/lib -lkpathsea
- KPSEINC = -I${PREFIX}/include -DKPATHSEA
-
- #
--CC=gcc
-+#CC=gcc
- #
--CCFLAGS = -g -O -DPOSIX
-+CCFLAGS = -O2 -DPOSIX
- #CCFLAGS = -O # SUNOS 4.X etc ...
- #CCFLAGS = -O -DPOSIX # NetBSD FreeBSD (gcc 2.X), Linux
- #CCFLAGS = -O -DMSDOS -DPOSIX # DJGCC (gcc 2.X)
-@@ -180,10 +181,8 @@
- ./tools/psstrip < color.psdoc > ${HDR}/color.ps
-
- install-man:
-- ${INSTALL} -c -m 444 man/div2ps.1 ${MANAREA}/cat1/dvi2ps.1
-- ${INSTALL} -c -m 444 man/div2ps.man ${MANAREA}/man1/dvi2ps.1
-- ${INSTALL} -c -m 444 man/div2ps.1j ${JMANAREA}/cat1/dvi2ps.1
-- ${INSTALL} -c -m 444 man/div2ps.jman ${JMANAREA}/man1/dvi2ps.1
-+ ${INSTALL} -c -m 444 man/dvi2ps.man ${MANAREA}/man1/dvi2ps.1
-+ ${INSTALL} -c -m 444 man/dvi2ps.jman ${JMANAREA}/man1/dvi2ps.1
-
- install-doc:
- -mkdir ${DOCAREA}
diff --git a/japanese/texfamily/patches/patch-af b/japanese/texfamily/patches/patch-af
deleted file mode 100644
index 45b2489b0c7..00000000000
--- a/japanese/texfamily/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.3 2001/10/24 00:29:31 kei Exp $
-
---- texk/web2c/Makefile.in.orig Tue Sep 18 13:53:39 2001
-+++ texk/web2c/Makefile.in Tue Sep 18 13:54:03 2001
-@@ -443,7 +443,7 @@
-
- latex.fmt: tex
- $(dumpenv) $(MAKE) $(makeargs) files="--progname=latex latex.ltx" prereq-check
-- $(dumpenv) ./tex --progname=latex --ini \\input latex.ltx </dev/null
-+ $(dumpenv) ./tex --progname=latex --ini \\input latex.ltx </dev/null || ${TRUE}
-
- latex209.fmt: tex
- $(dumpenv) $(MAKE) $(makeargs) files="--progname=latex209 lplain.tex" prereq-check
diff --git a/japanese/texfamily/patches/patch-ag b/japanese/texfamily/patches/patch-ag
deleted file mode 100644
index e8b41b9dba2..00000000000
--- a/japanese/texfamily/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.3 2001/10/24 00:29:31 kei Exp $
-
---- texk/web2c-j/Makefile.in.orig Mon Sep 17 18:08:21 2001
-+++ texk/web2c-j/Makefile.in Mon Sep 17 18:08:41 2001
-@@ -464,7 +464,7 @@
-
- jlatex.fmt: jtex
- $(dumpenv) $(MAKE) $(makeargs) files="--progname=jlatex jlatex.ltx" prereq-check
-- $(dumpenv) ./jtex --progname=jlatex --ini \\input jlatex.ltx </dev/null
-+ $(dumpenv) ./jtex --progname=jlatex --ini \\input jlatex.ltx </dev/null || ${TRUE}
-
- jlatex209.fmt: jtex
- $(dumpenv) $(MAKE) $(makeargs) files="--progname=jlatex209 jlplain.tex" prereq-check
diff --git a/japanese/texfamily/patches/patch-ah b/japanese/texfamily/patches/patch-ah
deleted file mode 100644
index cd42b7d30db..00000000000
--- a/japanese/texfamily/patches/patch-ah
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-ah,v 1.1.1.1 2001/04/14 12:58:56 kei Exp $
-
---- texk/jmakeindex/src/makefile.unx.orig Fri Apr 13 15:00:08 2001
-+++ texk/jmakeindex/src/makefile.unx Fri Apr 13 15:15:04 2001
-@@ -6,7 +6,7 @@
- # University of California, Berkeley
- #
-
--DEST = /usr/local/bin
-+DEST = ${PREFIX}/bin
-
- MANDIR = /usr/local/man/manl
-
-@@ -24,11 +24,9 @@
-
- CFLAGS = -O
-
--LDFLAGS = $(CFLAGS)
--
- LIBS =
-
--LINKER = cc
-+LINKER = ${CC}
-
- MAKEFILE = Makefile
-
-@@ -48,7 +46,7 @@
- scanst.c \
- sortid.c
-
--PROGRAM = makeindex
-+PROGRAM = jmakeindex
-
- TAR = $(PROGRAM).tar
-
-@@ -62,7 +60,7 @@
- @size $(PROGRAM)
-
- install: $(PROGRAM)
-- install -c -s -m 0755 $(PROGRAM) $(DEST)
-+ ${INSTALL_PROGRAM} $(PROGRAM) $(DEST)
- @ls -lgs $(DEST)/$(PROGRAM)
-
- tar:; @rm -f $(TAR)
diff --git a/japanese/texfamily/patches/patch-ai b/japanese/texfamily/patches/patch-ai
deleted file mode 100644
index a1f441e6972..00000000000
--- a/japanese/texfamily/patches/patch-ai
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2001/04/18 00:33:11 kei Exp $
-
---- texk/kpathsea/texmf.in.orig Mon Apr 16 16:50:18 2001
-+++ texk/kpathsea/texmf.in Mon Apr 16 16:53:20 2001
-@@ -60,6 +60,9 @@
- % A place for local additions to a "standard" texmf tree. For example:
- TEXMFLOCAL = @texmflocal@
-
-+% Add site-specific configurations as well as above.
-+TEXMFSITE = @TEXMFSITE@
-+
- % If defined, teTeX's texconfig stores modifications here (instead of the
- % TEXMFMAIN tree).
- % VARTEXMF = @texmf@-var
-@@ -74,7 +77,7 @@
- % - list $VARTEXMF in the TEXMF definition;
- % - make sure that $VARTEXMF precedes $TEXMFMAIN in the TEXMF definition.
- %TEXMF = !!$TEXMFMAIN
--TEXMF = {!!$TEXMFLOCAL,!!$TEXMFMAIN}
-+TEXMF = {!!$TEXMFSITE,!!$TEXMFLOCAL,!!$TEXMFMAIN}
-
- % The system trees. These are the trees that are shared by all the users.
- SYSTEXMF = $TEXMF
diff --git a/japanese/texfamily/patches/patch-aj b/japanese/texfamily/patches/patch-aj
deleted file mode 100644
index bea85dd4c48..00000000000
--- a/japanese/texfamily/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.2 2001/10/24 00:29:31 kei Exp $
-
---- texk/web2c-m/Makefile.in.orig Tue Sep 18 15:37:37 2001
-+++ texk/web2c-m/Makefile.in Tue Sep 18 15:38:07 2001
-@@ -460,7 +460,7 @@
-
- mullatex.fmt: multex
- $(dumpenv) $(MAKE) $(makeargs) files="--progname=mullatex mullatex.ltx" prereq-check
-- $(dumpenv) ./multex --progname=mullatex --ini \\input mullatex.ltx </dev/null
-+ $(dumpenv) ./multex --progname=mullatex --ini \\input mullatex.ltx </dev/null || ${TRUE}
-
- mullatex209.fmt: multex
- $(dumpenv) $(MAKE) $(makeargs) files="--progname=mullatex209 mullplain.tex" prereq-check
diff --git a/japanese/vflib-lib/DESCR b/japanese/vflib-lib/DESCR
deleted file mode 100644
index af62818cf82..00000000000
--- a/japanese/vflib-lib/DESCR
+++ /dev/null
@@ -1,29 +0,0 @@
-VFlib is the Japanese vector font library, supporting TrueType, Zeit,
-JG, and BDF fonts. The Watanabe-vector font(pkgsrc/fonts/watanabe_vfont)
-is used by default for mincho(min) and gothic(goth).
-
-You can use your own fonts by installing them (/usr/share/font is
-recommended) and adding them to ${PREFIX}/lib/VFlib/vfontcap.
-
-See ${PREFIX}/lib/VFlib/doc/man.ps or the website for more details
-(in Japanese).
-
-This port supports the FreeType library. Freetype makes use of hinting
-information in TrueType font files so that clearer output is possible.
-To use Freetype with TrueType fonts, simply modify
-${PREFIX}/lib/VFlib/vfontcap as follows:
-
- 1. Change `truetype' to `freetype', then
- 2. Add .ttf or .ttc to the font file path.
-
-For example:
-
-# Before...
-r-ricoh-ttw-hg-mincho-l-pro|Ricoh TrueTypeWorld HG Mincho L PRO:\
- :ft=truetype:\
- :ff=/usr/local/lib/dp/font/truetype/hgrmlpsj:
-
-# After...
-r-ricoh-ttw-hg-mincho-l-pro|Ricoh TrueTypeWorld HG Mincho L PRO:\
- :ft=freetype:\
- :ff=/usr/local/lib/dp/font/truetype/hgrmlpsj.ttf:
diff --git a/japanese/vflib-lib/Makefile b/japanese/vflib-lib/Makefile
deleted file mode 100644
index 25cb411f881..00000000000
--- a/japanese/vflib-lib/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# $NetBSD: Makefile,v 1.7 2001/09/09 04:06:10 jlam Exp $
-
-PKGNAME= ja-vflib-lib-${VFLIB_VERSION}
-COMMENT= Japanese Vector font library
-
-USE_BUILDLINK_ONLY= # defined
-
-.include "Makefile.common"
-
-CONFIGURE_ARGS+= --without-x
-ALL_TARGET= build-src
-INSTALL_TARGET= install-src
-
-post-build:
-.for FILE in vfontcap vfontcap.bdf
- cd ${WRKSRC}; \
- ${MV} ${FILE} ${FILE}.orig; \
- ${SED} -e "s|/usr/local/share/fonts|${PREFIX}/share/fonts|g" \
- ${FILE}.orig > ${FILE}; \
- ${RM} ${FILE}.orig
-.endfor
-
-post-install:
- ${MV} ${PREFIX}/share/VFlib/${VFLIB_VERSION}/VF.h ${PREFIX}/include
-
- ${INSTALL_DATA_DIR} ${PREFIX}/share/VFlib/${VFLIB_VERSION}
- cd ${WRKSRC}; ${INSTALL_DATA} COPYING COPYING.LIB README.txt.JP_EUC \
- ${PREFIX}/share/VFlib/${VFLIB_VERSION}
- cd ${WRKSRC}; ${PAX} -rw jTeX ${PREFIX}/share/VFlib/${VFLIB_VERSION}
- ${CHMOD} -R a-w ${PREFIX}/share/VFlib/${VFLIB_VERSION}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/japanese/vflib-lib/Makefile.common b/japanese/vflib-lib/Makefile.common
deleted file mode 100644
index 9098ac90e6f..00000000000
--- a/japanese/vflib-lib/Makefile.common
+++ /dev/null
@@ -1,36 +0,0 @@
-# $NetBSD: Makefile.common,v 1.14 2001/09/09 04:06:10 jlam Exp $
-# FreeBSD Id: Makefile,v 1.20 1999/05/03 01:58:33 steve Exp $
-
-DISTNAME= VFlib2-${VFLIB_VERSION}
-CATEGORIES+= japanese print
-MASTER_SITES+= ftp://gull.se.hiroshima-u.ac.jp/pub/TypeHack/
-DISTFILES+= ${VFLIB_SRC}
-
-VFLIB_SRC= ${DISTNAME}${EXTRACT_SUFX}
-
-MAINTAINER= tech-pkg-ja@jp.netbsd.org
-HOMEPAGE= http://TypeHack.aial.hiroshima-u.ac.jp/VFlib/
-
-VFLIB_VERSION= 2.24.2
-PLIST_SUBST+= VFLIB_VERSION=${VFLIB_VERSION}
-PLIST_SUBST+= VFLIB_SO_VERSION=${VFLIB_VERSION:C/^2.//}
-
-USE_LIBTOOL= # defined
-LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
-
-FT_LIB= ttf -lintl
-FT_INCLUDEDIR= ${BUILDLINK_DIR}/include/freetype
-FT_LIBDIR= ${BUILDLINK_DIR}/lib
-
-GNU_CONFIGURE= # defined
-CONFIGURE_ARGS+= --with-freetype="${FT_LIB}"
-CONFIGURE_ARGS+= --with-freetype-includedir=${FT_INCLUDEDIR}
-CONFIGURE_ARGS+= --with-freetype-libdir=${FT_LIBDIR}
-MAKE_ENV+= LOCAL_LDFLAGS="${LDFLAGS}"
-
-DISTINFO_FILE= ${.CURDIR}/../../japanese/vflib-lib/distinfo
-PATCHDIR= ${.CURDIR}/../../japanese/vflib-lib/patches
-
-EXTRACT_ONLY= ${VFLIB_SRC}
-
-.include "../../graphics/freetype-lib/buildlink.mk"
diff --git a/japanese/vflib-lib/PLIST b/japanese/vflib-lib/PLIST
deleted file mode 100644
index 44f33c1fdfa..00000000000
--- a/japanese/vflib-lib/PLIST
+++ /dev/null
@@ -1,417 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:29:43 zuntum Exp $
-bin/bdfindex
-bin/fwindex
-bin/ttindex
-include/VF.h
-lib/libVFlib2.a
-lib/libVFlib2.la
-lib/libVFlib2.so
-lib/libVFlib2.so.24
-lib/libVFlib2.so.24.2
-share/VFlib/${VFLIB_VERSION}/COPYING
-share/VFlib/${VFLIB_VERSION}/COPYING.LIB
-share/VFlib/${VFLIB_VERSION}/QA-english.tex
-share/VFlib/${VFLIB_VERSION}/QA.txt
-share/VFlib/${VFLIB_VERSION}/README.txt.JP_EUC
-share/VFlib/${VFLIB_VERSION}/jTeX/README.euc
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/MakeSlantTFM
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/Makefile
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/goth10.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/goth10.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/goth10.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/goth12.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/goth12.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/goth12.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/goth17.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/goth17.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/goth17.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/goth5.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/goth5.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/goth5.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/goth6.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/goth6.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/goth6.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/goth7.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/goth7.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/goth7.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/goth8.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/goth8.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/goth8.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/goth9.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/goth9.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/goth9.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothsla10.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothsla10.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothsla10.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothsla12.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothsla12.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothsla12.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothsla17.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothsla17.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothsla17.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothsla5.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothsla5.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothsla5.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothsla6.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothsla6.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothsla6.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothsla7.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothsla7.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothsla7.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothsla8.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothsla8.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothsla8.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothsla9.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothsla9.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothsla9.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslb10.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslb10.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslb10.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslb12.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslb12.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslb12.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslb17.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslb17.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslb17.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslb5.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslb5.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslb5.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslb6.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslb6.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslb6.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslb7.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslb7.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslb7.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslb8.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslb8.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslb8.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslb9.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslb9.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslb9.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslc10.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslc10.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslc10.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslc12.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslc12.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslc12.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslc17.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslc17.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslc17.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslc5.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslc5.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslc5.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslc6.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslc6.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslc6.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslc7.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslc7.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslc7.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslc8.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslc8.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslc8.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslc9.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslc9.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslc9.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothsld10.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothsld10.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothsld10.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothsld12.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothsld12.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothsld12.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothsld17.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothsld17.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothsld17.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothsld5.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothsld5.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothsld5.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothsld6.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothsld6.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothsld6.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothsld7.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothsld7.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothsld7.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothsld8.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothsld8.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothsld8.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothsld9.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothsld9.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothsld9.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothsle10.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothsle10.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothsle10.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothsle12.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothsle12.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothsle12.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothsle17.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothsle17.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothsle17.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothsle5.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothsle5.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothsle5.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothsle6.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothsle6.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothsle6.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothsle7.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothsle7.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothsle7.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothsle8.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothsle8.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothsle8.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothsle9.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothsle9.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothsle9.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslf10.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslf10.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslf10.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslf12.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslf12.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslf12.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslf17.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslf17.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslf17.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslf5.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslf5.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslf5.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslf6.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslf6.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslf6.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslf7.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslf7.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslf7.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslf8.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslf8.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslf8.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslf9.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslf9.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslf9.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslg10.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslg10.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslg10.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslg12.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslg12.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslg12.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslg17.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslg17.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslg17.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslg5.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslg5.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslg5.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslg6.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslg6.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslg6.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslg7.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslg7.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslg7.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslg8.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslg8.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslg8.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslg9.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslg9.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/gothslg9.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/min10.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/min10.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/min10.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/min12.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/min12.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/min12.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/min17.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/min17.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/min17.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/min5.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/min5.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/min5.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/min6.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/min6.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/min6.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/min7.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/min7.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/min7.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/min8.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/min8.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/min8.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/min9.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/min9.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/min9.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minsla10.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minsla10.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minsla10.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minsla12.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minsla12.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minsla12.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minsla17.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minsla17.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minsla17.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minsla5.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minsla5.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minsla5.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minsla6.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minsla6.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minsla6.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minsla7.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minsla7.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minsla7.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minsla8.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minsla8.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minsla8.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minsla9.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minsla9.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minsla9.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslb10.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslb10.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslb10.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslb12.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslb12.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslb12.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslb17.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslb17.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslb17.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslb5.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslb5.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslb5.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslb6.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslb6.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslb6.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslb7.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslb7.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslb7.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslb8.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslb8.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslb8.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslb9.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslb9.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslb9.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslc10.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslc10.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslc10.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslc12.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslc12.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslc12.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslc17.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslc17.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslc17.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslc5.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslc5.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslc5.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslc6.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslc6.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslc6.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslc7.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslc7.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslc7.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslc8.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslc8.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslc8.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslc9.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslc9.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslc9.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minsld10.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minsld10.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minsld10.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minsld12.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minsld12.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minsld12.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minsld17.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minsld17.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minsld17.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minsld5.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minsld5.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minsld5.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minsld6.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minsld6.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minsld6.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minsld7.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minsld7.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minsld7.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minsld8.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minsld8.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minsld8.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minsld9.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minsld9.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minsld9.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minsle10.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minsle10.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minsle10.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minsle12.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minsle12.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minsle12.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minsle17.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minsle17.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minsle17.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minsle5.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minsle5.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minsle5.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minsle6.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minsle6.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minsle6.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minsle7.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minsle7.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minsle7.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minsle8.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minsle8.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minsle8.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minsle9.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minsle9.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minsle9.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslf10.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslf10.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslf10.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslf12.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslf12.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslf12.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslf17.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslf17.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslf17.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslf5.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslf5.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslf5.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslf6.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslf6.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslf6.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslf7.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslf7.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslf7.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslf8.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslf8.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslf8.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslf9.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslf9.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslf9.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslg10.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslg10.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslg10.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslg12.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslg12.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslg12.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslg17.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslg17.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslg17.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslg5.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslg5.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslg5.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslg6.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslg6.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslg6.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslg7.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslg7.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslg7.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslg8.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslg8.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslg8.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslg9.nwfadj
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslg9.pl
-share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc/minslg9.tfm
-share/VFlib/${VFLIB_VERSION}/jTeX/jfonts/Gen
-share/VFlib/${VFLIB_VERSION}/jTeX/jfonts/Makefile
-share/VFlib/${VFLIB_VERSION}/jTeX/macros/Gen
-share/VFlib/${VFLIB_VERSION}/jTeX/macros/STYLE-SRC
-share/VFlib/${VFLIB_VERSION}/man.dvi
-share/VFlib/${VFLIB_VERSION}/man.ps
-share/VFlib/${VFLIB_VERSION}/vfontcap
-share/VFlib/${VFLIB_VERSION}/vfontcap.bdf
-share/VFlib/${VFLIB_VERSION}/vfontcap.comp2
-@dirrm share/VFlib/${VFLIB_VERSION}/jTeX/macros
-@dirrm share/VFlib/${VFLIB_VERSION}/jTeX/jfonts
-@dirrm share/VFlib/${VFLIB_VERSION}/jTeX/jfmsrc
-@dirrm share/VFlib/${VFLIB_VERSION}/jTeX
-@dirrm share/VFlib/${VFLIB_VERSION}
-@dirrm share/VFlib
diff --git a/japanese/vflib-lib/buildlink.mk b/japanese/vflib-lib/buildlink.mk
deleted file mode 100644
index a0f0bc2b859..00000000000
--- a/japanese/vflib-lib/buildlink.mk
+++ /dev/null
@@ -1,36 +0,0 @@
-# $NetBSD: buildlink.mk,v 1.9 2001/07/27 13:33:31 jlam Exp $
-#
-# This Makefile fragment is included by packages that use VFlib.
-#
-# To use this Makefile fragment, simply:
-#
-# (1) Optionally define BUILDLINK_DEPENDS.vflib to the dependency pattern
-# for the version of VFlib desired.
-# (2) Include this Makefile fragment in the package Makefile,
-# (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header
-# search path, and
-# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search
-# path.
-
-.if !defined(VFLIB_BUILDLINK_MK)
-VFLIB_BUILDLINK_MK= # defined
-
-.include "../../mk/bsd.buildlink.mk"
-
-BUILDLINK_DEPENDS.vflib?= ja-vflib-lib>=2.24.2
-DEPENDS+= ${BUILDLINK_DEPENDS.vflib}:../../japanese/vflib-lib
-
-EVAL_PREFIX+= BUILDLINK_PREFIX.vflib=ja-vflib-lib
-BUILDLINK_PREFIX.vflib_DEFAULT= ${LOCALBASE}
-BUILDLINK_FILES.vflib= include/VF.h
-BUILDLINK_FILES.vflib+= lib/libVFlib2.*
-
-.include "../../graphics/freetype-lib/buildlink.mk"
-
-BUILDLINK_TARGETS.vflib= vflib-buildlink
-BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.vflib}
-
-pre-configure: ${BUILDLINK_TARGETS.vflib}
-vflib-buildlink: _BUILDLINK_USE
-
-.endif # VFLIB_BUILDLINK_MK
diff --git a/japanese/vflib-lib/distinfo b/japanese/vflib-lib/distinfo
deleted file mode 100644
index 63b245c2f6e..00000000000
--- a/japanese/vflib-lib/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: distinfo,v 1.5 2001/06/25 20:19:53 jlam Exp $
-
-SHA1 (VFlib2-2.24.2.tar.gz) = 970ab8e18e50f10763af27ebcfee135bbfdbcda5
-Size (VFlib2-2.24.2.tar.gz) = 540093 bytes
-SHA1 (patch-aa) = c78284c8126b8a2f1ccf43360b9f2e0f0468c2e1
-SHA1 (patch-ab) = 1654d8a602097eed3a8fb4c146287eadbae0c3be
-SHA1 (patch-ac) = 6a8b1b8565ca4ce689fc5b873faf15ea6268da01
-SHA1 (patch-ad) = 329c265785f4e3134b67f37c1e1d1f7f6aa60337
-SHA1 (patch-ae) = 6b2512548bc122b915c15067791aeecfcb2ef8a6
-SHA1 (patch-af) = daae96f7c5218eb9fd22d297121a93f5bd266bed
diff --git a/japanese/vflib-lib/patches/patch-aa b/japanese/vflib-lib/patches/patch-aa
deleted file mode 100644
index 5a0133c086a..00000000000
--- a/japanese/vflib-lib/patches/patch-aa
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/05/01 21:58:42 jlam Exp $
-
---- Makefile.in.orig Mon Sep 14 01:25:04 1998
-+++ Makefile.in Mon May 1 04:37:47 2000
-@@ -10,17 +10,22 @@
-
- LIBTOOL=./libtool
-
--all:
-- (cd src; $(MAKE) $@)
-+all: build-src build-tools
-+install: install-src install-tools
-+
-+build-src:
-+ (cd src; $(MAKE) all)
-+
-+build-tools:
- if test -d /usr/openwin ; then \
- (cd tools; \
- OPENWINHOME=/usr/openwin; export OPENWINHOME; \
-- xmkmf; $(MAKE) $@) \
-+ xmkmf; $(MAKE) all) \
- else \
-- (cd tools; xmkmf -a; $(MAKE) $@) \
-+ (cd tools; xmkmf -a; $(MAKE) all) \
- fi
-
--install:
-+install-src:
- @if [ ! -d $(bindir) ] ; then \
- ./recmkdir $(bindir); fi
- @if [ ! -d $(libdir) ] ; then \
-@@ -29,10 +34,12 @@
- ./recmkdir $(includedir); fi
- @if [ ! -d $(runtimedir) ] ; then \
- ./recmkdir $(runtimedir); fi
-- (cd src; $(MAKE) $@)
-- (cd tools; $(MAKE) $@)
-+ (cd src; $(MAKE) install)
- $(CP) vfontcap* $(runtimedir)
- $(CP) doc/*.dvi doc/*.ps doc/QA* $(runtimedir)
-+
-+install-tools:
-+ (cd tools; $(MAKE) install)
-
- uninstall:
- -(cd src; $(MAKE) $@)
diff --git a/japanese/vflib-lib/patches/patch-ab b/japanese/vflib-lib/patches/patch-ab
deleted file mode 100644
index 4775d14327a..00000000000
--- a/japanese/vflib-lib/patches/patch-ab
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2001/05/28 03:24:30 jlam Exp $
-
---- configure.in.orig Wed Feb 17 23:58:02 1999
-+++ configure.in Wed Jul 19 17:36:22 2000
-@@ -54,6 +54,11 @@
- fi
- AC_SUBST(XX_CFLAGS)
-
-+AC_ARG_ENABLE(
-+ tools,
-+ [ --enable-tools Build VFlib tools],
-+ build_tools=yes,
-+ build_tools=no)
-
- AC_SUBST(freetype_includedir)
- AC_SUBST(freetype_libdir)
-@@ -117,6 +122,7 @@
- AC_CONFIG_HEADER(src/with.h src/config.h)
- AC_OUTPUT(Makefile make-sub src/Makefile tools/Imakefile)
-
-+if test "$build_tools" = "yes" ; then
- if test -d /usr/openwin ; then \
- (cd tools; \
- OPENWINHOME=/usr/openwin; \
-@@ -124,6 +130,7 @@
- xmkmf;) \
- else \
- (cd tools; xmkmf -a) \
-+fi
- fi
-
- dnl EOF
diff --git a/japanese/vflib-lib/patches/patch-ac b/japanese/vflib-lib/patches/patch-ac
deleted file mode 100644
index 9868452055a..00000000000
--- a/japanese/vflib-lib/patches/patch-ac
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2001/06/25 20:19:53 jlam Exp $
-
---- src/Makefile.in.orig Tue Oct 27 02:33:17 1998
-+++ src/Makefile.in
-@@ -61,7 +61,7 @@
- # VFlib
- $(VFLIB): $(CORE_OBJ) $(DRV_OBJ)
- $(LIBTOOL) --mode=link \
-- $(CC) -o $(VFLIB) $(CORE_OBJ) $(DRV_OBJ) \
-+ $(CC) $(LDFLAGS) -o $(VFLIB) $(CORE_OBJ) $(DRV_OBJ) \
- -version-info @version_info@ -rpath $(libdir) \
- $(EXT_LIBRARY)
-
-@@ -183,13 +183,13 @@
-
- # Installing
- install:
-- $(LIBTOOL) $(CP) $(VFLIB) $(libdir)/$(VFLIB)
-+ $(LIBTOOL) $(BSD_INSTALL_DATA) $(VFLIB) $(libdir)/$(VFLIB)
- $(LIBTOOL) -n --finish $(libdir)
-- $(CP) VF.h $(includedir)/VF.h
-- $(CP) VF.h $(runtimedir)/VF.h
-- $(LIBTOOL) $(CP) ttindex $(bindir)/ttindex
-- $(LIBTOOL) $(CP) bdfindex $(bindir)/bdfindex
-- $(LIBTOOL) $(CP) bdfindex $(bindir)/fwindex
-+ $(BSD_INSTALL_DATA) VF.h $(includedir)/VF.h
-+ $(BSD_INSTALL_DATA) VF.h $(runtimedir)/VF.h
-+ $(LIBTOOL) $(BSD_INSTALL_PROGRAM) ttindex $(bindir)/ttindex
-+ $(LIBTOOL) $(BSD_INSTALL_PROGRAM) bdfindex $(bindir)/bdfindex
-+ $(LIBTOOL) $(BSD_INSTALL_PROGRAM) bdfindex $(bindir)/fwindex
- uninstall:
- -$(LIBTOOL) $(RM) $(libdir)/$(VFLIB)
- -$(RM) $(includedir)/VF.h
diff --git a/japanese/vflib-lib/patches/patch-ad b/japanese/vflib-lib/patches/patch-ad
deleted file mode 100644
index 1d1a514b067..00000000000
--- a/japanese/vflib-lib/patches/patch-ad
+++ /dev/null
@@ -1,90 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2001/05/28 03:24:30 jlam Exp $
-
---- tools/Imakefile.in.orig Tue Oct 27 03:02:45 1998
-+++ tools/Imakefile.in Mon May 1 04:41:40 2000
-@@ -23,19 +23,19 @@
- VFLIB_INCDIR = ../src
- VFLIB_LIBDIR = ../src
-
-- VFLIB = $(VFLIB_LIBDIR)/libVFlib2.la
-+ VFLIB = $(LDFLAGS) -lVFlib2 $(EXT_LIBRARY)
-
- PROGRAMS = disol kban ktest vfperf vftest fmtest
- SRCS = disol.c kban.c ktest.c vfperf.c vftest.c fmtest.c
- OBJS = disol.lo kban.lo ktest.lo vfperf.lo vftest.lo fmtest.lo
-- INSTALL_PROGRAMS = ktest
-+ INSTALL_PROGRAMS = $(PROGRAMS)
-
- default all:: $(PROGRAMS)
- include ../make-sub
-
-
- /* DISOL */
--disol: disol.lo $(VFLIB)
-+disol: disol.lo
- $(LIBTOOL) --mode=link \
- $(CC) -o $@ disol.lo $(VFLIB)
- disol.lo: disol.c
-@@ -43,7 +43,7 @@
- $(CC) $(CFLAGS) -c disol.c
-
- /* KBAN */
--kban: kban.lo $(VFLIB)
-+kban: kban.lo
- $(LIBTOOL) --mode=link \
- $(CC) -o $@ kban.lo $(VFLIB)
- kban.lo: kban.c
-@@ -51,7 +51,7 @@
- $(CC) $(CFLAGS) -c kban.c
-
- /* KTEST */
--ktest: ktest.lo $(DEPXLIB) $(VFLIB)
-+ktest: ktest.lo $(DEPXLIB)
- $(LIBTOOL) --mode=link \
- $(CC) -o $@ $(LDOPTIONS) ktest.lo $(XLIB) $(VFLIB)
- ktest.lo: ktest.c
-@@ -59,7 +59,7 @@
- $(CC) $(CFLAGS) $(ALLINCLUDES) -c ktest.c
-
- /* VF2BDF */
--vf2bdf: vf2bdf.lo $(VFLIB)
-+vf2bdf: vf2bdf.lo
- $(LIBTOOL) --mode=link \
- $(CC) -o $@ vf2bdf.lo $(VFLIB)
- vf2bdf.lo: vf2bdf.c
-@@ -67,7 +67,7 @@
- $(CC) $(CFLAGS) -c vf2bdf.c
-
- /* VFPERF */
--vfperf: vfperf.lo $(VFLIB)
-+vfperf: vfperf.lo
- $(LIBTOOL) --mode=link \
- $(CC) -o $@ vfperf.lo $(VFLIB)
- vfperf.lo: vfperf.c
-@@ -75,7 +75,7 @@
- $(CC) $(CFLAGS) -c vfperf.c
-
- /* VFTEST */
--vftest: vftest.lo $(DEPXLIB) $(VFLIB)
-+vftest: vftest.lo $(DEPXLIB)
- $(LIBTOOL) --mode=link \
- $(CC) -o $@ $(LDOPTIONS) vftest.lo $(XLIB) $(VFLIB)
- vftest.lo: vftest.c
-@@ -83,7 +83,7 @@
- $(CC) $(CFLAGS) $(ALLINCLUDES) -c vftest.c
-
- /* FMTEST */
--fmtest: fmtest.lo $(VFLIB)
-+fmtest: fmtest.lo
- $(LIBTOOL) --mode=link \
- $(CC) -o $@ fmtest.lo $(VFLIB)
- fmtest.lo: fmtest.c
-@@ -96,7 +96,7 @@
- @if [ ! -d $(bindir) ] ; then \
- ./recmkdir $(bindir); fi
- @for P in $(INSTALL_PROGRAMS) ; do \
-- $(LIBTOOL) $(CP) $$P $(bindir)/$$P ; \
-+ $(LIBTOOL) $(BSD_INSTALL_PROGRAM) $$P $(bindir)/$$P ; \
- done;
- uninstall::
- @for P in $(INSTALL_PROGRAMS) ; do \
diff --git a/japanese/vflib-lib/patches/patch-ae b/japanese/vflib-lib/patches/patch-ae
deleted file mode 100644
index 2d30eea9c3a..00000000000
--- a/japanese/vflib-lib/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2001/05/03 04:37:53 jlam Exp $
-
---- make-sub.in.orig Mon Aug 31 05:22:45 1998
-+++ make-sub.in
-@@ -1,7 +1,7 @@
- # Common definitions
-
- CC=@CC@
--CFLAGS=@XX_CFLAGS@
-+CFLAGS=@CFLAGS@ @XX_CFLAGS@
- LDFLAGS=@LDFLAGS@
- EXT_LIBRARY=@freetype_libdir@ @freetype_lib@ @sony_fslib@ -lm
- INSTALL=@INSTALL@
diff --git a/japanese/vflib-lib/patches/patch-af b/japanese/vflib-lib/patches/patch-af
deleted file mode 100644
index 50cc1754c71..00000000000
--- a/japanese/vflib-lib/patches/patch-af
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-af,v 1.1 2001/05/28 03:24:30 jlam Exp $
-
---- configure.orig Wed Feb 17 23:58:33 1999
-+++ configure Sun May 27 18:43:19 2001
-@@ -78,6 +78,8 @@
- ac_help="$ac_help
- --with-gnu-ld assume the C compiler uses GNU ld [default=no]"
- ac_help="$ac_help
-+ --enable-tools Build VFlib tools"
-+ac_help="$ac_help
- --with-freetype[=LIB] Link FreeType library LIB [LIB=ttf]"
- ac_help="$ac_help
- --with-freetype-includedir=DIR FreeType include files are in DIR"
-@@ -1480,6 +1614,14 @@
- fi
-
-
-+# Check whether --enable-tools or --disable-tools was given.
-+if test "${enable_tools+set}" = set; then
-+ enableval="$enable_tools"
-+ build_tools=yes
-+else
-+ build_tools=no
-+fi
-+
-
-
-
-@@ -2616,6 +2761,7 @@
- test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-
-
-+if test "$build_tools" = "yes" ; then
- if test -d /usr/openwin ; then \
- (cd tools; \
- OPENWINHOME=/usr/openwin; \
-@@ -2623,5 +2769,6 @@
- xmkmf;) \
- else \
- (cd tools; xmkmf -a) \
-+fi
- fi
-
diff --git a/japanese/vflib-utils/DESCR b/japanese/vflib-utils/DESCR
deleted file mode 100644
index 53953495a04..00000000000
--- a/japanese/vflib-utils/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-This packages includes several test programs to test various features
-of the VFlib2 library, including:
-
- disol dissassembler of vector font files
- kban banner-like program
- ktest displays all characters in a font file on an X window
- vfperf performance test program
diff --git a/japanese/vflib-utils/Makefile b/japanese/vflib-utils/Makefile
deleted file mode 100644
index 8695684a513..00000000000
--- a/japanese/vflib-utils/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2001/09/09 04:06:10 jlam Exp $
-
-PKGNAME= ja-vflib-utils-${VFLIB_VERSION}
-COMMENT= Utilities for manipulating VFlib vector font files
-
-BUILDLINK_DEPENDS.vflib=ja-vflib-lib>=${VFLIB_VERSION}
-USE_BUILDLINK_ONLY= # defined
-
-.include "../vflib-lib/Makefile.common"
-
-USE_X11= # defined
-CONFIGURE_ARGS+= --enable-tools --with-x
-
-ALL_TARGET= build-tools
-INSTALL_TARGET= install-tools
-
-.include "../../japanese/vflib-lib/buildlink.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/japanese/vflib-utils/PLIST b/japanese/vflib-utils/PLIST
deleted file mode 100644
index c71b60e4ffe..00000000000
--- a/japanese/vflib-utils/PLIST
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:29:44 zuntum Exp $
-bin/disol
-bin/fmtest
-bin/kban
-bin/ktest
-bin/vfperf
-bin/vftest
diff --git a/japanese/vflib/DESCR b/japanese/vflib/DESCR
deleted file mode 100644
index 259a90bfc02..00000000000
--- a/japanese/vflib/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-VFlib is the Japanese vector font library, supporting TrueType, Zeit,
-JG, and BDF fonts. The Watanabe-vector font is used by default for
-mincho(min) and gothic(goth).
-
-This meta-package includes the ja-vflib-lib and ja-vflib-utils packages.
diff --git a/japanese/vflib/Makefile b/japanese/vflib/Makefile
deleted file mode 100644
index f86b7ab7ffa..00000000000
--- a/japanese/vflib/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# $NetBSD: Makefile,v 1.10 2001/02/16 15:25:31 wiz Exp $
-
-DISTNAME= ja-vflib-${VFLIB_VERSION}
-VFLIB_VERSION= 2.24.2
-CATEGORIES= japanese print
-MASTER_SITES= # empty
-DISTFILES= # empty
-
-MAINTAINER= tech-pkg-ja@jp.netbsd.org
-HOMEPAGE= http://TypeHack.aial.hiroshima-u.ac.jp/VFlib/
-COMMENT= Japanese Vector font libraries and utilities
-
-DEPENDS+= ja-vflib-lib-${VFLIB_VERSION}:../../japanese/vflib-lib
-DEPENDS+= ja-vflib-utils-${VFLIB_VERSION}:../../japanese/vflib-utils
-
-USE_X11= # defined # ja-vflib-utils uses X11
-
-EXTRACT_ONLY= # empty
-NO_CHECKSUM= # defined
-NO_PATCH= # defined
-NO_CONFIGURE= # defined
-NO_BUILD= # defined
-
-do-install: # empty
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/japanese/vflib/PLIST b/japanese/vflib/PLIST
deleted file mode 100644
index 16bd0f0ec55..00000000000
--- a/japanese/vflib/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:29:42 zuntum Exp $
-@comment this plist intentionally left empty
diff --git a/japanese/vfxdvik/DESCR b/japanese/vfxdvik/DESCR
deleted file mode 100644
index 7a50642ef1d..00000000000
--- a/japanese/vfxdvik/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-ja-vfxdvik is an extension of xdvik with Japanese support by vflib.
diff --git a/japanese/vfxdvik/Makefile b/japanese/vfxdvik/Makefile
deleted file mode 100644
index 8ddb225446f..00000000000
--- a/japanese/vfxdvik/Makefile
+++ /dev/null
@@ -1,68 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2002/03/13 17:37:20 fredb Exp $
-#
-
-DISTNAME= xdvik-22.15
-PKGNAME= ja-vfxdvik-22.15
-PKGREVISION= 1
-CATEGORIES= japanese print
-MASTER_SITES= ftp://ftp.appi.keio.ac.jp/pub/xdvi/
-
-PATCH_SITES= ftp://ftp.appi.keio.ac.jp/pub/xdvi/
-PATCHFILES= xdvik-22.15-j1.04.patch.gz
-PATCH_DIST_ARGS=-d ${WRKSRC} --quiet -E -p1
-
-MAINTAINER= tech-pkg-ja@jp.netbsd.org
-HOMEPAGE= # no home page
-COMMENT= xdvik with vflib
-
-DEPENDS+= TeXfamily>=1.2.1:../../japanese/texfamily
-DEPENDS+= ja-vflib-lib-[0-9]*:../../japanese/vflib-lib
-
-XDVI_DIR= ${WRKDIR}/${DISTNAME}/texk/xdvik
-
-USE_GMAKE= yes
-USE_X11= yes
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+=--enable-local-texmf=texmf.local \
- --without-texinfo \
- --without-dialog \
- --disable-multiplatform \
- --enable-ipc \
- --with-epsfwin \
- --with-hp2627win \
- --with-mftalkwin \
- --with-x11 \
- --with-system-wwwlib=yes \
- --with-libwww-config=${LOCALBASE}/bin/libwww-config \
- --with-system-pnglib \
- --with-pnglib-libdir=${LOCALBASE}/lib \
- --with-pnglib-include=${LOCALBASE}/include \
- --with-system-zlib \
- --enable-xdviprint=${LOCALBASE}/bin/vfxdviprint \
- --enable-xdvietcdir=${LOCALBASE}/share/texmf.local/vfxdvi
-
-.include "../../mk/bsd.prefs.mk"
-.if defined(PAPERSIZE) && ${PAPERSIZE} == "A4"
-CONFIGURE_ARGS+=--enable-a4
-.endif
-
-.if ${OPSYS} != "SunOS"
-CONFIGURE_ARGS+=--enable-auto-core \
- --with-zlib-libdir=/usr/lib \
- --with-zlib-include=/usr/include
-.else
-CONFIGURE_ARGS+= --with-zlib-libdir=${LOCALBASE}/lib \
- --with-zlib-include=${LOCALBASE}/include
-.endif
-
-CONFIGURE_ENV+= INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
- INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
- INSTALL_DATA="${INSTALL_DATA}"
-
-do-build:
- cd ${XDVI_DIR} && ${MAKE_PROGRAM}
-
-do-install:
- cd ${XDVI_DIR} && ${MAKE_PROGRAM} install
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/japanese/vfxdvik/PLIST b/japanese/vfxdvik/PLIST
deleted file mode 100644
index 041863af4be..00000000000
--- a/japanese/vfxdvik/PLIST
+++ /dev/null
@@ -1,10 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:29:45 zuntum Exp $
-bin/vfxdvi.bin
-bin/vfxdvi
-bin/vfxdviprint
-man/man1/vfxdvi.1
-share/texmf.local/vfxdvi/vfontmap
-share/texmf.local/vfxdvi/xdvipaper.dvi2ps-j
-share/texmf.local/vfxdvi/xdvipaper.dvips
-share/texmf.local/vfxdvi/xdvipaper.jdvi2kps
-@dirrm share/texmf.local/vfxdvi
diff --git a/japanese/vfxdvik/distinfo b/japanese/vfxdvik/distinfo
deleted file mode 100644
index f9739762b77..00000000000
--- a/japanese/vfxdvik/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2001/06/06 05:13:48 kei Exp $
-
-SHA1 (xdvik-22.15.tar.gz) = c453f43d60428bab08b4efddae0e882f5768c7cc
-Size (xdvik-22.15.tar.gz) = 1541496 bytes
-SHA1 (xdvik-22.15-j1.04.patch.gz) = 59667accf6497aabfbcba7a241c05a730c057a0d
-Size (xdvik-22.15-j1.04.patch.gz) = 133696 bytes
-SHA1 (patch-ac) = d117bec083069f98cfc419d717ba3878c2b94f40
-SHA1 (patch-ad) = 0931e15d67bd0ab3a24e3c436ce41cbd4ad2fcd5
-SHA1 (patch-ae) = ab7c26a017341467341d447753522cb66e0d0e52
-SHA1 (patch-af) = aebab7020f5507c3fc479810b43fd66deb0e56c4
-SHA1 (patch-ag) = c228a4a61e58bd79c5a7fbe443f7ef6c88272122
diff --git a/japanese/vfxdvik/patches/patch-ac b/japanese/vfxdvik/patches/patch-ac
deleted file mode 100644
index a6e058ec61a..00000000000
--- a/japanese/vfxdvik/patches/patch-ac
+++ /dev/null
@@ -1,96 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2001/06/06 05:13:49 kei Exp $
-
---- texk/xdvik/Makefile.in.orig Wed May 30 22:11:44 2001
-+++ texk/xdvik/Makefile.in Wed May 30 22:12:36 2001
-@@ -45,8 +45,9 @@
- # -lXaw -lXmu -lXt -lSM -lICE -lXext -lX11 (some may not be present).
- x_link = $(LDLIBWWW) $(x_ldflags) $(x_tool_libs) $(x_pre_libs) $(x_ext_lib) -lX11 $(x_extra_libs)
-
--LDLIBWWW=@LDLIBWWW@
-+LDLIBWWW=$(shell libwww-config --libs)
- LIBWWWCPPFLAGS=@LIBWWWCPPFLAGS@
-+#LIBWWWCPPFLAGS=$(shell libwww-config --cflags)
- LIBWWWDEP=@LIBWWWDEP@
- LIBWWWDIR = ../../libs/libwww
- LIBWWWSRCDIR = $(srcdir)/../../libs/libwww
-@@ -69,13 +70,13 @@
- paper.o tategaki.o vfontmap.o \
- $(ALLOCA)
-
--program = xdvi.bin
-+program = vfxdvi.bin
- programs = $(program)
-
--default all: $(programs) xdvi.1 xdviprint
-+default all: $(programs) vfxdvi.1 vfxdviprint
-
--$(program): $(kpathsea) $(objects) $(LIBWWWDEP)
-- $(kpathsea_link) $(objects) $(x_link) $(VFLIB) $(LOADLIBES)
-+$(program): $(kpathsea) $(objects)
-+ $(link_command) $(objects) $(x_link) $(VFLIB) $(LOADLIBES)
-
- squeeze: squeeze.o
- $(link_command) squeeze.o $(LIBS) $(XLOADLIBES)
-@@ -83,10 +84,10 @@
- psheader.c: psheader.txt squeeze
- ./squeeze $(srcdir)/psheader.txt $@
-
--xdvi.1: xdvi.man sedscript
-+vfxdvi.1: xdvi.man sedscript
- sed -f sedscript <$(srcdir)/xdvi.man >$@
-
--xdviprint: Makefile xdviprint.sample
-+vfxdviprint: Makefile xdviprint.sample
- if test -x /usr/bin/nawk; then \
- sed -e '/^## for @DVIFILTER@/,/^##/s/^# //' -e 's/awk/nawk/' \
- -e "s,/usr/local/share/texmf/xdvi,$(XDVIETCDIR)," \
-@@ -102,9 +103,6 @@
- $(SHELL) $(srcdir)/mksedscript $(srcdir) pkpath sizes vfpath \
- figpath headerpath $(DEFS) $(prog_cflags) >$@
-
--$(LIBWWWDIR)/libwww.a:
-- cd $(LIBWWWDIR); $(MAKE) $(makeargs) libwww.a
--
- # ac_include ../make/tkpathsea.mk
-
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -112,21 +110,21 @@
- install: install-exec install-data
- uninstall: uninstall-exec uninstall-data
-
--install-exec: $(programs) xdviprint
-+install-exec: $(programs) vfxdviprint
- $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
- for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $(bindir) $$p; done
-- $(INSTALL_SCRIPT) $(srcdir)/xdvi-sh $(scriptdir)/xdvi
-+ $(INSTALL_SCRIPT) $(srcdir)/xdvi-sh $(scriptdir)/vfxdvi
- if test "@XDVIPRINTCMD@" != no; then \
- if test ! -x @XDVIPRINTCMD@; then \
-- $(INSTALL_SCRIPT) $(srcdir)/xdviprint @XDVIPRINTCMD@; \
-+ $(INSTALL_SCRIPT) $(srcdir)/vfxdviprint @XDVIPRINTCMD@; \
- fi; \
- fi
- uninstall-exec:
- for p in $(programs) xdvi; do rm -f $(bindir)/$$p; done
-
--install-data: xdvi.1 vfontmap.sample
-+install-data: vfxdvi.1 vfontmap.sample
- $(SHELL) $(top_srcdir)/../mkinstalldirs $(mandir) $(psheaderdir) $(XDVIETCDIR)
-- $(INSTALL_DATA) xdvi.1 $(mandir)/xdvi.$(manext)
-+ $(INSTALL_DATA) vfxdvi.1 $(mandir)/vfxdvi.$(manext)
- if test ! -f $(XDVIETCDIR)/vfontmap; then \
- $(INSTALL_DATA) vfontmap.sample $(XDVIETCDIR)/vfontmap; \
- fi
-@@ -158,12 +156,8 @@
- clean::
- rm -f *.flc
-
--# clean::
--# test -f $(LIBWWWDIR)/Makefile && { cd $(LIBWWWDIR); $(MAKE) clean; } || true
--
- distclean::
- rm -f psheader.c sedscript xdvi.1 *.flc
--# test -f $(LIBWWWDIR)/Makefile && { cd $(LIBWWWDIR); $(MAKE) distclean; } || true
-
- ac_include ../make/rdepend.mk
- ac_include depend.make
diff --git a/japanese/vfxdvik/patches/patch-ad b/japanese/vfxdvik/patches/patch-ad
deleted file mode 100644
index e3e4286225c..00000000000
--- a/japanese/vfxdvik/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2001/06/06 05:13:49 kei Exp $
-
---- texk/make/paths.mk.orig Mon Jan 11 00:42:53 1999
-+++ texk/make/paths.mk Mon May 28 22:59:54 2001
-@@ -46,7 +46,7 @@
- texmf = @texmfmain@
-
- # The directory used by varfonts.
--vartexfonts = /var/tmp/texfonts
-+vartexfonts = /var/spool/texfonts
-
- # Regular input files.
- texinputdir = $(texmf)/tex
diff --git a/japanese/vfxdvik/patches/patch-ae b/japanese/vfxdvik/patches/patch-ae
deleted file mode 100644
index d643c32345a..00000000000
--- a/japanese/vfxdvik/patches/patch-ae
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2001/06/06 05:13:49 kei Exp $
-
---- texk/xdvik/withenable.ac.orig Wed May 30 22:19:29 2001
-+++ texk/xdvik/withenable.ac Wed May 30 22:24:24 2001
-@@ -57,9 +57,9 @@
- esac)
-
- # Check what command the user wants to use for print-out.
--XDVIPRINTCMD='$(scriptdir)/xdviprint'
-+XDVIPRINTCMD='$(scriptdir)/vfxdviprint'
- XDVIPRINT_DEF="-DXDVIPRINTCMD=\\\"$XDVIPRINTCMD\\\""
--AC_ARG_ENABLE(xdviprint,
-+AC_ARG_ENABLE(vfxdviprint,
- [ --enable-xdviprint=CMD set print-out script path or no; default /usr/local/bin/xdviprint],
- [case $enableval in
- yes) XDVIPRINTCMD='$(scriptdir)/xdviprint'
diff --git a/japanese/vfxdvik/patches/patch-af b/japanese/vfxdvik/patches/patch-af
deleted file mode 100644
index ad5fffe1ef1..00000000000
--- a/japanese/vfxdvik/patches/patch-af
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2001/06/06 05:13:49 kei Exp $
-
---- texk/xdvik/xdvi-sh.orig Wed May 30 21:56:50 2001
-+++ texk/xdvik/xdvi-sh Wed May 30 21:56:30 2001
-@@ -45,4 +45,4 @@
- XFILESEARCHPATH="$xdviapppath:${XFILESEARCHPATH-%D}"; export XFILESEARCHPATH
- fi
-
--exec xdvi.bin $NAMEOPT ${1+"$@"}
-+exec vfxdvi.bin $NAMEOPT ${1+"$@"}
diff --git a/japanese/vfxdvik/patches/patch-ag b/japanese/vfxdvik/patches/patch-ag
deleted file mode 100644
index e180946d765..00000000000
--- a/japanese/vfxdvik/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 2001/06/06 05:13:49 kei Exp $
-
---- texk/make/common.mk.orig Wed May 30 21:58:55 2001
-+++ texk/make/common.mk Wed May 30 21:58:01 2001
-@@ -42,7 +42,7 @@
- kpathsea_dir = $(kpathsea_parent)/kpathsea
- kpathsea_srcdir_parent = $(top_srcdir)/..
- kpathsea_srcdir = $(kpathsea_srcdir_parent)/kpathsea
--kpathsea = $(kpathsea_dir)/libkpathsea.la
-+kpathsea = /usr/pkg/lib/libkpathsea.a
-
- @MAINT@ifeq ($(CC), gcc)
- @MAINT@XDEFS = -Wall -Wpointer-arith $(warn_more)
diff --git a/japanese/xjdic/DESCR b/japanese/xjdic/DESCR
deleted file mode 100644
index 6b7419143b1..00000000000
--- a/japanese/xjdic/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-XJDIC is an electronic Japanese-English dictionary program designed to
-operate in the X11 window environment. In particular, it must run in an
-"xterm" environment which has Japanese language support such as provided by
-"kterm" or internationalized xterm, aixterm, etc.
diff --git a/japanese/xjdic/MESSAGE b/japanese/xjdic/MESSAGE
deleted file mode 100644
index 017dfaf1bf5..00000000000
--- a/japanese/xjdic/MESSAGE
+++ /dev/null
@@ -1,5 +0,0 @@
-===========================================================================
-
- Copy ${PREFIX}/share/doc/xjdic/.xjdicrc to your $HOME/.xjdicrc !
-
-===========================================================================
diff --git a/japanese/xjdic/Makefile b/japanese/xjdic/Makefile
deleted file mode 100644
index afe930732fe..00000000000
--- a/japanese/xjdic/Makefile
+++ /dev/null
@@ -1,53 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/01/03 01:02:24 hubertf Exp $
-#
-
-DISTNAME= xjdic23
-PKGNAME= xjdic-2.3
-CATEGORIES= japanese
-MASTER_SITES= http://www.bcit-broadcast.com/monash/
-EXTRACT_SUFX= .tgz
-DISTFILES+= edict.gz \
- kanjidic.gz \
- ${DISTNAME}${EXTRACT_SUFX}
-
-MAINTAINER= hubertf@netbsd.org
-HOMEPAGE= http://www.csse.monash.edu.au/~jwb/xjdic/
-COMMENT= Japanese dictionary
-
-WRKSRC= ${WRKDIR}
-MESSAGE_SUBST+= PREFIX=${PREFIX}
-EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
-
-do-install:
- cd ${WRKSRC} ; \
- for i in exjdxgen xjdic_cl xjdic_sa xjdserver xjdxgen ; \
- do \
- ${INSTALL_PROGRAM} $$i ${PREFIX}/bin ; \
- done
- ${MV} ${PREFIX}/bin/xjdic_sa ${PREFIX}/bin/xjdic
- ${INSTALL_DATA_DIR} ${PREFIX}/share/xjdic
- ${INSTALL_DATA} \
- ${WRKSRC}/kanjstroke \
- ${WRKSRC}/radicals.tm \
- ${WRKSRC}/radkfile \
- ${WRKSRC}/romkana.cnv \
- ${WRKSRC}/vconj \
- ${PREFIX}/share/xjdic
- ${INSTALL_MAN_DIR} ${PREFIX}/share/doc/xjdic
- ${INSTALL_MAN} \
- ${WRKSRC}/xjdic22.WHATSNEW \
- ${WRKSRC}/xjdic23.WHATSNEW \
- ${WRKSRC}/xjdic23.inf \
- ${WRKSRC}/xjdic23.install \
- ${PREFIX}/share/doc/xjdic
- ${INSTALL_MAN} ${WRKSRC}/xjdic.1 ${PREFIX}/man/man1
- ${GZIP_CMD} -cd ${DISTDIR}/kanjidic.gz >${PREFIX}/share/xjdic/kanjidic
- ${GZIP_CMD} -cd ${DISTDIR}/edict.gz >${PREFIX}/share/xjdic/edict
- ${PREFIX}/bin/xjdxgen ${PREFIX}/share/xjdic/edict
- ${PREFIX}/bin/xjdxgen ${PREFIX}/share/xjdic/kanjidic
- ${SED} \
- -e 's,/home/jwb/nihongo/dics,${PREFIX}/share/xjdic,' \
- -e '/^kdicfile/s/kanjidic_b/kanjidic/' \
- < ${WRKSRC}/.xjdicrc.skel >${PREFIX}/share/doc/xjdic/.xjdicrc
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/japanese/xjdic/PLIST b/japanese/xjdic/PLIST
deleted file mode 100644
index b445b6ac5ee..00000000000
--- a/japanese/xjdic/PLIST
+++ /dev/null
@@ -1,23 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/01/03 01:02:24 hubertf Exp $
-bin/exjdxgen
-bin/xjdic_cl
-bin/xjdic
-bin/xjdserver
-bin/xjdxgen
-share/doc/xjdic/xjdic22.WHATSNEW
-share/doc/xjdic/xjdic23.WHATSNEW
-share/doc/xjdic/xjdic23.inf
-share/doc/xjdic/xjdic23.install
-share/doc/xjdic/.xjdicrc
-share/xjdic/kanjstroke
-share/xjdic/radkfile
-share/xjdic/vconj
-share/xjdic/romkana.cnv
-share/xjdic/radicals.tm
-share/xjdic/kanjidic
-share/xjdic/kanjidic.xjdx
-share/xjdic/edict
-share/xjdic/edict.xjdx
-man/man1/xjdic.1
-@dirrm share/doc/xjdic
-@dirrm share/xjdic
diff --git a/japanese/xjdic/distinfo b/japanese/xjdic/distinfo
deleted file mode 100644
index 0ea09a98e67..00000000000
--- a/japanese/xjdic/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/01/03 01:02:24 hubertf Exp $
-
-SHA1 (edict.gz) = a4b5f0e25e6eb83be9f1442de511ae6cb2e0cb45
-Size (edict.gz) = 1706759 bytes
-SHA1 (kanjidic.gz) = b0e0fbe07791f711633c6df6bfa507afe2dfd338
-Size (kanjidic.gz) = 470456 bytes
-SHA1 (xjdic23.tgz) = f5b364b7b50abaa4ffc862f5140d0c47b4438d16
-Size (xjdic23.tgz) = 136415 bytes
-SHA1 (patch-aa) = 7e3dad15962b0ac69bf25c6f98cbbff8925aed8d
-SHA1 (patch-ab) = 32dfe757b0a20a72cb336177eec08ba85e89231a
diff --git a/japanese/xjdic/patches/patch-aa b/japanese/xjdic/patches/patch-aa
deleted file mode 100644
index 083f9130fe1..00000000000
--- a/japanese/xjdic/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/01/03 01:02:24 hubertf Exp $
-
---- Makefile.orig Wed Sep 16 13:08:01 1998
-+++ Makefile
-@@ -54,7 +54,7 @@
- #
- #LIBS= -lsocket -lnsl
- #
--CC=gcc -g
-+CC=gcc -D__STRICT_BSD__ -DPREFIX=\"${PREFIX}\"
- all: xjdic_sa xjdic_cl xjdserver xjdxgen exjdxgen
- client: xjdic_cl
- server: xjdserver
diff --git a/japanese/xjdic/patches/patch-ab b/japanese/xjdic/patches/patch-ab
deleted file mode 100644
index 1ca2a9c8443..00000000000
--- a/japanese/xjdic/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/01/03 01:02:24 hubertf Exp $
-
---- xjdic.h.orig Thu Sep 3 11:05:28 1998
-+++ xjdic.h
-@@ -3,7 +3,7 @@
- #define NRKANA 250*2 /* size of the romaji to kana tables*/
- #define NOFILT 10 /* maximum number of general filters */
- #define VMAX 350 /* maximum entries in the verb table */
--#define DEFAULT_DICDIR "" /* could be: "/usr/local/lib/xjdic" */
-+#define DEFAULT_DICDIR PREFIX "share/xjdic" /* could be: "/usr/local/lib/xjdic" */
- #define NOHITS 1000 /* size of hittab */
- #define SPTAG '@' /* character that flags priority entries */
- #define KFBUFFSIZE 2000 /* size of the KFlush buffer */
diff --git a/japanese/xjman/DESCR b/japanese/xjman/DESCR
deleted file mode 100644
index 6f973655f93..00000000000
--- a/japanese/xjman/DESCR
+++ /dev/null
@@ -1,12 +0,0 @@
-Japanized X manual, presented by "The X Japanese Documentation Project".
-
-Copyright (c) 1993 The Regents of the University of California.
-All rights reserved.
-Copyright (c) 1998-1999 The X Japanese Documentation Project.
-
-This product includes software developed by
-the University of California, Lawrence Berkeley Laboratory.
-
-X Japanese Documentation Project <URL:http://xjman.dsl.gr.jp/>
-X Free86(TM): Home Page <URL:http://www.xfree86.org/>
-The X Window System <URL:http://www.x.org/>
diff --git a/japanese/xjman/MESSAGE b/japanese/xjman/MESSAGE
deleted file mode 100644
index 2aa6ec6a1d1..00000000000
--- a/japanese/xjman/MESSAGE
+++ /dev/null
@@ -1,13 +0,0 @@
-======================================================================
-$NetBSD: MESSAGE,v 1.1 2001/10/31 23:29:46 zuntum Exp $
-
-Copyright (c) 1993 The Regents of the University of California.
-All rights reserved.
-Copyright (c) 1998-1999 The X Japanese Documentation Project.
---
-This product includes software developed by
-the University of California, Lawrence Berkeley Laboratory.
---
-Refer to the documentations at `${X11BASE}/share/doc/xjman/'.
-
-======================================================================
diff --git a/japanese/xjman/Makefile b/japanese/xjman/Makefile
deleted file mode 100644
index d1f021bb3c7..00000000000
--- a/japanese/xjman/Makefile
+++ /dev/null
@@ -1,74 +0,0 @@
-# $NetBSD: Makefile,v 1.8 2001/09/27 23:18:15 jlam Exp $
-# FreeBSD Id: ports/japanese/xjman/Makefile,v 1.10 1999/10/30 15:34:24 sada Exp
-
-DISTNAME= xjman-0.5
-CATEGORIES= japanese x11
-MASTER_SITES= http://xjman.dsl.gr.jp/
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= sakamoto@netbsd.org
-HOMEPAGE= http://xjman.dsl.gr.jp/
-COMMENT= Japanized X manual from "The X Japanese Documentation Project"
-
-DEPENDS+= ja-man-[0-9]*:../../japanese/man
-
-USE_X11BASE= yes
-PLIST_SRC= ${WRKDIR}/PLIST
-WRKSRC= ${WRKDIR}/man/ja_JP.eucJP
-XJMANDIR= man/ja_JP.EUC
-MAKE_ENV+= XJMANDIR=${XJMANDIR}
-
-NO_CONFIGURE= yes
-
-MANCOMPRESSED_IF_MANZ= yes
-
-.include "../../mk/bsd.prefs.mk"
-
-post-extract:
-.for f in Makefile Makefile.inc
- @${CP} ${FILESDIR}/${f} ${WRKSRC}
-.endfor
-
-pre-build:
-.for dir in man1 man3 man5
- @(cd ${WRKSRC}/${dir}; \
- for file in *; do \
- f=`${ECHO} $$file|${SED} -e 's|x$$||'`; \
- mlink=`head -1 $$file|${GREP} '^\.so man./'| \
- ${SED} -e 's|.*man./\(.*\)x|\1|'`; \
- if [ "$$mlink" = "" ]; then \
- ${ECHO} "MAN+= $$f" >> Makefile; \
- ${MV} $$file $$f; \
- else \
- ${ECHO} "MLINKS+= $$mlink $$f" >> Makefile; \
- ${SED} -e 's|x$$||' $$file > $$f; \
- ${RM} $$file; \
- fi; \
- done; \
- ${ECHO} ".include <bsd.prog.mk>" >> Makefile; \
- )
-.endfor
-
-MKCATPAGES?= yes
-
-post-build:
- @${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
- @(cd ${WRKSRC}; \
- ${FIND} man1/*.1 man3/*.3 man5/*.5 -type f | \
- ${SED} -e 's|^|${XJMANDIR}/|' | sort >> ${PLIST_SRC})
-.if ${MKCATPAGES} != no
- @(cd ${WRKSRC}; \
- ${FIND} man1/*.1 man3/*.3 man5/*.5 -type f | \
- ${SED} -e 's|^|${XJMANDIR}/|' \
- -e 's|man[135]\(/.*\)\.\([135]\)$$|cat\2\1.0|' | \
- sort >> ${PLIST_SRC})
-.endif
-
-post-install:
- @${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xjman
-.for i in COPYRIGHT COPYRIGHT.XJDP
- @${INSTALL_DATA} ${FILESDIR}/$i ${PREFIX}/share/doc/xjman
-.endfor
- @${INSTALL_DATA} ${WRKDIR}/man/README ${PREFIX}/share/doc/xjman
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/japanese/xjman/PLIST b/japanese/xjman/PLIST
deleted file mode 100644
index a0b7f8decd7..00000000000
--- a/japanese/xjman/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:29:46 zuntum Exp $
-share/doc/xjman/COPYRIGHT
-share/doc/xjman/COPYRIGHT.XJDP
-share/doc/xjman/README
-@dirrm share/doc/xjman
diff --git a/japanese/xjman/distinfo b/japanese/xjman/distinfo
deleted file mode 100644
index 5ec249916d7..00000000000
--- a/japanese/xjman/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 10:13:38 wiz Exp $
-
-SHA1 (xjman-0.5.tar.bz2) = 5282a9ec6fede402ee64c487b30ae52e885ec681
-Size (xjman-0.5.tar.bz2) = 799554 bytes
diff --git a/japanese/xjman/files/COPYRIGHT b/japanese/xjman/files/COPYRIGHT
deleted file mode 100644
index 9c0a7f19e6b..00000000000
--- a/japanese/xjman/files/COPYRIGHT
+++ /dev/null
@@ -1,396 +0,0 @@
-
-
-
-
-
-
-
-
-
- Copyright
-
- The XFree86 Project, Inc.
-
-
-
-1. XFree86 Copyright
-
-XFree86 code without an explicit copyright is covered by the following copy-
-right:
-
-Copyright (C) 1994-1998 The XFree86 Project, Inc. All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
-NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the XFree86 Project shall not
-be used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from the XFree86 Project.
-
-
-2. Other Copyrights
-
-Portions of code are covered by the following copyrights:
-
-2.1 X Consortium
-
-Copyright (C) 1996 X Consortium
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-
-Copyright 1
-
-
-
-
-
-Copyright 2
-
-
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
-NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE X
-CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not be
-used in advertising or otherwise to promote the sale, use or other dealings in
-this Software without prior written authorization from the X Consortium.
-
-X Window System is a trademark of X Consortium, Inc.
-
-2.2 Berkeley-based copyrights:
-
-2.2.1 General
-
-Redistribution and use in source and binary forms, with or without modifica-
-tion, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- 3. The name of the author may not be used to endorse or promote products
- derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
-CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
-SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEM-
-PLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTER-
-RUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
-WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-2.2.2 UCB/LBL
-
-Copyright (c) 1993 The Regents of the University of California. All rights
-reserved.
-
-This software was developed by the Computer Systems Engineering group at
-Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and contributed to
-Berkeley.
-
-All advertising materials mentioning features or use of this software must dis-
-play the following acknowledgement: This product includes software developed by
-the University of California, Lawrence Berkeley Laboratory.
-
-
-
-
-
-
-
-
-
-Copyright 3
-
-
-
-Redistribution and use in source and binary forms, with or without modifica-
-tion, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- 3. All advertising materials mentioning features or use of this software
- must display the following acknowledgement: This product includes soft-
- ware developed by the University of California, Berkeley and its contrib-
- utors.
-
- 4. Neither the name of the University nor the names of its contributors may
- be used to endorse or promote products derived from this software without
- specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WAR-
-RANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDI-
-RECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
-OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIA-
-BILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-
-2.3 NVidia Corp
-
-Copyright (c) 1996-1998 NVIDIA, Corp. All rights reserved.
-
-NOTICE TO USER: The source code is copyrighted under U.S. and international
-laws. NVIDIA, Corp. of Sunnyvale, California owns the copyright and as design
-patents pending on the design and interface of the NV chips. Users and posses-
-sors of this source code are hereby granted a nonexclusive, royalty-free copy-
-right and design patent license to use this code in individual and commercial
-software.
-
-Any use of this source code must include, in the user documentation and inter-
-nal comments to the code, notices to the end user as follows:
-
-Copyright (c) 1996-1998 NVIDIA, Corp. NVIDIA design patents pending in the
-U.S. and foreign countries.
-
-NVIDIA, CORP. MAKES NO REPRESENTATION ABOUT THE SUITABILITY OF THIS SOURCE
-CODE FOR ANY PURPOSE. IT IS PROVIDED "AS IS" WITHOUT EXPRESS OR IMPLIED WAR-
-RANTY OF ANY KIND. NVIDIA, CORP. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
-SOURCE CODE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL NVIDIA, CORP. BE LIABLE FOR ANY
-SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSO-
-EVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
-
-
-
-
-
-
-
-
-Copyright 4
-
-
-
-CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-WITH THE USE OR PERFORMANCE OF THIS SOURCE CODE.
-
- Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/CPYRIGHT.sgml,v 3.9.2.2 1998/01/24 11:55:06 dawes Exp $
-
-
-
-
-
- $XConsortium: CPYRIGHT.sgml /main/5 1996/10/25 16:24:53 kaleb $
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Copyright 5
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- CONTENTS
-
-
-
-1. XFree86 Copyright ........................................................ 1
-
-2. Other Copyrights ......................................................... 1
- 2.1 X Consortium ......................................................... 1
- 2.2 Berkeley-based copyrights: ........................................... 2
- 2.3 NVidia Corp .......................................................... 3
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- i
-
-
diff --git a/japanese/xjman/files/COPYRIGHT.XJDP b/japanese/xjman/files/COPYRIGHT.XJDP
deleted file mode 100644
index 813cddc1d12..00000000000
--- a/japanese/xjman/files/COPYRIGHT.XJDP
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c),A 1998-1999 The X Japanese Documentation Project.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish, dis-
-tribute, sublicense, and/or sell copies of the Software, and to permit
-persons to whom the Software is furnished to do so, subject to the fol-
-lowing conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL-
-ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-SHALL THE X JAPANESE DOCUMENTATION PROJECT BE LIABLE FOR ANY CLAIM,
-DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The X Japanese
-Documentation Project shall not be used in advertising or otherwise to
-promote the sale, use or other dealings in this Software without prior
-written authorization from The X Japanese Documentation Project.
-
-X Window System is a trademark of The Open Group.
diff --git a/japanese/xjman/files/Makefile b/japanese/xjman/files/Makefile
deleted file mode 100644
index af0d7b795a5..00000000000
--- a/japanese/xjman/files/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIR= man1 man3 man5
-
-.include <bsd.subdir.mk>
diff --git a/japanese/xjman/files/Makefile.inc b/japanese/xjman/files/Makefile.inc
deleted file mode 100644
index 57436e9185c..00000000000
--- a/japanese/xjman/files/Makefile.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-NROFF= jgnroff -Tnippon
-MANDIR= ${PREFIX}/${XJMANDIR}
-TMACDIR= ${LOCALBASE}/share/groff/tmac
-CATDEPS= ${TMACDIR}/tmac.andocj \
- ${TMACDIR}/tmac.docj \
- ${TMACDIR}/mdoc/doc-ditroffj \
- ${TMACDIR}/mdoc/doc-commonj \
- ${TMACDIR}/mdoc/doc-nroffj \
- ${TMACDIR}/mdoc/doc-symsj