Hi,
The japanese/ category is long overdue for cleanup. Some of the ports in
there are ancient and haven't been touched since being imported a long
long time ago.
I'd like to start with jvim and jless.
jvim is an unmaintained patchset on top of a 21-year-old version of vim.
In the intervening years, vim has gained its own support for some
Japanese encodings via the "fileencodings" setting.
Even better, you can convert Japanese files to UTF-8 with nkf or iconv.
(nkf autodetects most Japanese encodings; with iconv you have to
specify input encoding manually.)
$ nkf -w some_shift_jis_file.txt > some_utf8_file1.txt
$ nkf -w some_euc_jp_file.txt > some_utf8_file2.txt
$ nkf -w some_iso_2022_jp_file.txt > some_utf8_file3.txt
jless is an unmaintained patchset on top of a 20-year-old version of
less. In the intervening years, less has gained its own support for
UTF-8. Piping files through nkf and then to /usr/bin/less should provide
equivalent functionality.
We can't keep pushing Japanese users onto ancient, unmaintained
software, even if that's the current status quo.
ok?
Index: Makefile
===================================================================
RCS file: /cvs/ports/japanese/Makefile,v
retrieving revision 1.29
diff -u -p -r1.29 Makefile
--- Makefile 10 Jun 2015 20:01:03 -0000 1.29
+++ Makefile 12 Apr 2017 15:43:46 -0000
@@ -5,10 +5,6 @@
SUBDIR += canna
SUBDIR += groff
SUBDIR += gwaei
- SUBDIR += jvim
- SUBDIR += jvim,canna
- SUBDIR += jvim,wnn
- SUBDIR += jvim,wnn,canna
SUBDIR += kakasi
SUBDIR += kanatest
SUBDIR += kanjipad
@@ -20,7 +16,6 @@
SUBDIR += kinput2,wnn
SUBDIR += kterm
SUBDIR += kterm,xaw3d
- SUBDIR += less
SUBDIR += mecab
SUBDIR += nkf
SUBDIR += onew,canna
Index: jvim/Makefile
===================================================================
RCS file: jvim/Makefile
diff -N jvim/Makefile
--- jvim/Makefile 11 Mar 2013 12:17:51 -0000 1.33
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,82 +0,0 @@
-# $OpenBSD: Makefile,v 1.33 2013/03/11 12:17:51 espie Exp $
-
-COMMENT= Japanized Vim
-COMMENT-canna= Japanized Vim, canna input method
-COMMENT-wnn= Japanized Vim, wnn input method
-COMMENT-wnn-canna=Japanized Vim, canna or wnn input method
-DISTNAME= jvim2.0r+onew2.2.10
-PKGNAME= ja-jvim-2.0r
-REVISION= 2
-CATEGORIES= japanese editors
-
-MASTER_SITES= ftp://ftp.lab.kdd.co.jp/Japan/onew/ \
- ftp://ftp.leo.chubu.ac.jp/pub/editor/jvim/
-
-MAINTAINER= Marc Espie <[email protected]>
-
-PERMIT_PACKAGE_CDROM= Yes
-
-WANTLIB= c termcap
-
-FLAVORS= wnn canna
-FLAVOR?=
-
-USE_GROFF = Yes
-
-.if ${FLAVOR:Mwnn}
-CHOICE=wnn4
-INPUT_METHOD=wnn4
-BUILD_DEPENDS+= japanese/Wnn
-JPDEF+= -DWNN_ISDIR
-JPLIB+= -ljd
-.endif
-
-.if ${FLAVOR:Mcanna}
-. if ${FLAVOR:Mwnn}
-INPUT_METHOD= wnn4-canna
-CHOICE=wnn4,canna
-. else
-INPUT_METHOD= canna
-CHOICE=canna
-.endif
-PERMIT_PACKAGE_CDROM= Canna prevents it
-PERMIT_PACKAGE_FTP= Yes
-WANTLIB += canna
-LIB_DEPENDS+= japanese/canna
-JPLIB+= -lcanna
-.endif
-
-
-.if defined(INPUT_METHOD) && !empty(INPUT_METHOD)
-BUILD_DEPENDS+= japanese/onew,${CHOICE}
-JPDEF+= -DONEW
-JPLIB:=-lonew-${INPUT_METHOD} ${JPLIB}
-.endif
-
-
-WRKDIST= ${WRKDIR}/jvim2.0r
-WRKSRC= ${WRKDIST}/src
-
-BFLAGS= JPDEF='${JPDEF}' \
- JPLIB='${JPLIB}' \
- JPCODE='-DJP=\".EE\"' \
- PREFIX='${PREFIX}' \
- MANDIR='$${PREFIX}/man/ja_JP.EUC' \
- MACHINE=-DBSD_UNIX \
- CC='cc ${CFLAGS} -Wall'
-
-MAKE_FILE= makefile.junx
-ALL_TARGET=jvim jcat jfold jgrep
-
-MAKE_FLAGS=${BFLAGS} PREFIX='${PREFIX}'
-FAKE_FLAGS=PREFIX='${WRKINST}${PREFIX}'
-
-NO_TEST= Yes
-
-post-install:
- @for file in jcat jgrep jfold jvim; do \
- ${STRIP} ${PREFIX}/bin/$$file; \
- done
- @echo "You may have to add man/ja_JP.EUC to _default in /etc/man.conf
manually"
-
-.include <bsd.port.mk>
Index: jvim/distinfo
===================================================================
RCS file: jvim/distinfo
diff -N jvim/distinfo
--- jvim/distinfo 18 Jan 2015 03:14:16 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,2 +0,0 @@
-SHA256 (jvim2.0r+onew2.2.10.tar.gz) =
jN3QvZj6Oe9r2jjV/VwA95GkLk0R917y21/Wtb00qfY=
-SIZE (jvim2.0r+onew2.2.10.tar.gz) = 569300
Index: jvim/patches/patch-src_jgrep_c
===================================================================
RCS file: jvim/patches/patch-src_jgrep_c
diff -N jvim/patches/patch-src_jgrep_c
--- jvim/patches/patch-src_jgrep_c 26 Oct 2007 21:42:18 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,75 +0,0 @@
-$OpenBSD: patch-src_jgrep_c,v 1.1 2007/10/26 21:42:18 ajacoutot Exp $
---- src/jgrep.c.orig Mon Jul 3 16:52:28 1995
-+++ src/jgrep.c Fri Oct 26 23:36:44 2007
-@@ -38,17 +38,19 @@ static int o_noerr = FALSE; /* -s */
- static int o_nomat = FALSE; /* -v */
- static int o_wsrch = FALSE; /* -w */
- static int o_scode = FALSE; /* -C */
-+static int o_sline = FALSE; /* -n */
-
- static void
- usage()
- {
- fprintf(stderr, "Jgrep/%s by [email protected]\n", JpVersion);
-- fprintf(stderr, "Usage: jgrep [ -cilsvwCNJESX., ] pattern [filename
...]\n");
-+ fprintf(stderr, "Usage: jgrep [ -cilsvnwCNJESX., ] pattern [filename
...]\n");
- fprintf(stderr, " -c Print only a count of the lines.\n");
- fprintf(stderr, " -i Ignore case.\n");
- fprintf(stderr, " -l Print only file name.\n");
- fprintf(stderr, " -s Suppress error message.\n");
- fprintf(stderr, " -v Print lines not match with the
pattern.\n");
-+ fprintf(stderr, " -n Print line number.\n");
- fprintf(stderr, " -w Search \\<pattern\\>.\n");
- fprintf(stderr, " -C Print kanji code.\n");
- fprintf(stderr, " -N -J -E -S -X \n");
-@@ -104,7 +106,7 @@ main(argc, argv)
- jread = jdisp = JP_NONE;
- #endif
-
-- if (argc > 1 && argv[0][0] == '-')
-+ while (argc > 1 && argv[0][0] == '-')
- {
- char *cp;
- for(cp = argv[0] + 1; *cp; cp++)
-@@ -127,6 +129,10 @@ main(argc, argv)
- o_noerr = TRUE;
- break;
-
-+ case 'n':
-+ o_sline = TRUE;
-+ break;
-+
- case 'v':
- o_nomat = TRUE;
- break;
-@@ -268,9 +274,11 @@ do_grep(fp, prog, fname)
- char *fname;
- {
- int count;
-+ int nline;
-
- reg_ic = o_icase;
- count = 0;
-+ nline = 0;
-
- reset_jcount();
-
-@@ -282,6 +290,9 @@ do_grep(fp, prog, fname)
- if (fgets(Line, IOSIZE, fp) == NULL)
- break;
-
-+ if (strchr(Line, '\n'))
-+ nline++;
-+
- len = strlen(Line);
- len = kanjiconvsfrom(Line, len, IObuff, IOSIZE * 2, NULL,
-
jread, NULL);
-@@ -294,6 +305,8 @@ do_grep(fp, prog, fname)
- {
- if (fname)
- printf("%s:", fname);
-+ if (o_sline)
-+ printf("%d:", nline);
- if (o_scode)
- printf("(%c)", judge_jcode(jread));
- if (o_nonly)
Index: jvim/patches/patch-src_jp_c
===================================================================
RCS file: jvim/patches/patch-src_jp_c
diff -N jvim/patches/patch-src_jp_c
--- jvim/patches/patch-src_jp_c 19 May 2010 14:25:44 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,27 +0,0 @@
-$OpenBSD: patch-src_jp_c,v 1.1 2010/05/19 14:25:44 espie Exp $
---- src/jp.c.orig Wed May 19 16:23:48 2010
-+++ src/jp.c Wed May 19 16:24:35 2010
-@@ -19,6 +19,7 @@
- #endif
-
- static int jisx0201rto0208();
-+static void abend_handler(int);
-
- #ifdef GENERAL
- # undef free
-@@ -34,7 +35,6 @@ static int jisx0201rto0208();
- core_handler(dummy)
- int dummy;
- {
-- static void abend_handler();
- abend_handler(TRUE);
- }
-
-@@ -42,7 +42,6 @@ core_handler(dummy)
- hup_handler(dummy)
- int dummy;
- {
-- static void abend_handler();
- abend_handler(FALSE);
- }
-
Index: jvim/patches/patch-src_makefile_junx
===================================================================
RCS file: jvim/patches/patch-src_makefile_junx
diff -N jvim/patches/patch-src_makefile_junx
--- jvim/patches/patch-src_makefile_junx 26 Oct 2007 21:42:18 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,90 +0,0 @@
-$OpenBSD: patch-src_makefile_junx,v 1.1 2007/10/26 21:42:18 ajacoutot Exp $
---- src/makefile.junx.orig Sun Jul 2 22:54:33 1995
-+++ src/makefile.junx Fri Oct 26 23:36:44 2007
-@@ -15,12 +15,12 @@ MDOMAIN = -DMDOMAIN=\"Set.Your.Mail.Domain\"
- #
- #>>>>> choose Japanese Kanji code
- #JPCODE = -DJP=\".NN\"
--#JPCODE = -DJP=\".EE\"
-+JPCODE = -DJP=\".EE\"
- #JPCODE = -DJP=\".NN\" -DJPFEP
-
- #>>>>> ONEW specific options
--JPDEF = -DONEW -DWNN_ISDIR # Wnn + Canna / Onew
--JPLIB = -lonew -ljd -lcanna # Wnn + Canna / Onew
-+#JPDEF = -DONEW -DWNN_ISDIR # Wnn + Canna / Onew
-+#JPLIB = -lonew -ljd -lcanna # Wnn + Canna / Onew
- #JPDEF = -DONEW # Canna / Onew
- #JPLIB = -lonew -lcanna # Canna / Onew
- #JPDEF = -DONEW -DWNN_ISDIR # Wnn / Onew
-@@ -47,7 +47,13 @@ JPLIBPATH = -L../../onew \
- -L/usr/X386/lib \
- -L/usr/local/X11R5/lib \
- -L/usr/local/lib \
-- -L/usr/lib
-+ -L/usr/lib \
-+ -L%LOCALBASE%/lib \
-+ -L%X11BASE%/lib \
-+ -L/usr/X11R6/lib
-+
-+INSTALL_MAN?= install -c -m ${MANMOD}
-+
- ######################################################################
-
- all:
-@@ -183,6 +189,7 @@ FreeBSD:
- @echo 'FreeBSD'
- $(MAKE) $(TARGET) \
- 'MACHINE = -DBSD_UNIX' \
-+ 'LIBS = -ltermcap' \
- 'CC = gcc -O2 -Wall'
-
- # for FreeBSD before 2.0.5R, 'LIBS = -ltermcap -lcompat' may be needed.
-@@ -193,6 +200,12 @@ NetBSD:
- 'MACHINE = -DBSD_UNIX' \
- 'CC = gcc -O2 -Wall'
-
-+OpenBSD:
-+ @echo 'OpenBSD'
-+ $(MAKE) $(TARGET) \
-+ 'MACHINE = -DBSD_UNIX' \
-+ 'CC = gcc -O2 -Wall'
-+
- AIX3.2:
- @echo 'AIX 3.2'
- $(MAKE) $(TARGET) \
-@@ -368,13 +381,13 @@ JFOLD = jfold
- JGREP = jgrep
-
- ### Prefix for location of files
--PREFIX = /usr/local/jvim2.0
-+PREFIX?= /usr/local
-
- ### Location of binary
- BINLOC = $(PREFIX)/bin
-
- ### Location of man page
--MANDIR = $(PREFIX)/man
-+MANDIR = $(PREFIX)/man/%MANLANG%
- MANLOC = $(MANDIR)/man1
-
- ### Location of help file
-@@ -500,14 +513,10 @@ install:
- chmod $(BINMOD) $(BINLOC)/$(JFOLD)
- @$(CSH) -f -c "if (! -d $(MANDIR)) mkdir $(MANDIR)"
- @$(CSH) -f -c "if (! -d $(MANLOC)) mkdir $(MANLOC)"
-- cp ../doc/$(MANFILE) $(MANLOC)
-- chmod $(MANMOD) $(MANLOC)/$(MANFILE)
-- cp ../doc/$(JGREP).1 ../doc/$(JGREP).man $(MANLOC)
-- chmod $(MANMOD) $(MANLOC)/$(JGREP).1 $(MANLOC)/$(JGREP).man
-- cp ../doc/$(JCAT).1 ../doc/$(JCAT).man $(MANLOC)
-- chmod $(MANMOD) $(MANLOC)/$(JCAT).1 $(MANLOC)/$(JCAT).man
-- cp ../doc/$(JFOLD).1 ../doc/$(JFOLD).man $(MANLOC)
-- chmod $(MANMOD) $(MANLOC)/$(JFOLD).1 $(MANLOC)/$(JFOLD).man
-+ ${INSTALL_MAN} ../doc/$(MANFILE) $(MANLOC)
-+ ${INSTALL_MAN} ../doc/$(JGREP).1 $(MANLOC)
-+ ${INSTALL_MAN} ../doc/$(JCAT).1 $(MANLOC)
-+ ${INSTALL_MAN} ../doc/$(JFOLD).1 $(MANLOC)
- @$(CSH) -f -c "if (! -d $(HELPLOC)) mkdir $(HELPLOC)"
- cp ../doc/$(HELPFILE) $(HELPLOC)
- chmod $(HELPMOD) $(HELPLOC)/$(HELPFILE)
Index: jvim/patches/patch-src_vim_h
===================================================================
RCS file: jvim/patches/patch-src_vim_h
diff -N jvim/patches/patch-src_vim_h
--- jvim/patches/patch-src_vim_h 26 Oct 2007 21:42:18 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,30 +0,0 @@
-$OpenBSD: patch-src_vim_h,v 1.1 2007/10/26 21:42:18 ajacoutot Exp $
---- src/vim.h.orig Mon Jul 3 03:26:28 1995
-+++ src/vim.h Fri Oct 26 23:36:45 2007
-@@ -92,7 +92,7 @@
- # include <stdlib.h>
- #endif
-
--#if defined(__FreeBSD__) || defined(__NetBSD__)
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
- # include <unistd.h>
- # include <sys/signal.h>
- #endif
-@@ -153,7 +153,7 @@
- #endif
-
- #ifdef UNIX
--# if !defined(DOMAIN) && !defined(MACH) && !defined(PureBSD43) &&
!defined(__FreeBSD__) && !defined(__NetBSD__)
-+# if !defined(DOMAIN) && !defined(MACH) && !defined(PureBSD43) &&
!defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
- # ifndef _POSIX_SOURCE
- # define _POSIX_SOURCE
- # endif
-@@ -191,7 +191,7 @@
- # endif
- #endif
-
--#if defined(UNICOS) || defined(__FreeBSD__) || defined(__NetBSD__)
/* would make sense for other systems too */
-+#if defined(UNICOS) || defined(__FreeBSD__) || defined(__NetBSD__) ||
defined(__OpenBSD__) /* would make sense for other systems too */
- # include <errno.h>
- #endif
-
Index: jvim/pkg/DESCR
===================================================================
RCS file: jvim/pkg/DESCR
diff -N jvim/pkg/DESCR
--- jvim/pkg/DESCR 26 Dec 2000 23:47:24 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-JVim is a text editor that is upwards compatible to vi. It can be used
-to edit any ASCII and Japanese(EUC or JIS) text. It is especially
-useful for editing programs.
-
-There are a lot of enhancements above vi: multi level undo, command
-line editing, filename completion, on line help, quoting, etc.. Read
-difference.doc for a summary of the differences between vi and Vim.
-
--- S. Taoka
-<[email protected]>
-
-Flavors (non-exclusive)
-wnn
- can use wnn input method
-canna
- can use canna input method
-
-Note that the wnn flavor can be installed even if Wnn is not present.
-In fact it can connect to a distant Wnn server as is.
Index: jvim/pkg/PLIST
===================================================================
RCS file: jvim/pkg/PLIST
diff -N jvim/pkg/PLIST
--- jvim/pkg/PLIST 16 Mar 2005 15:43:19 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-@comment $OpenBSD: PLIST,v 1.5 2005/03/16 15:43:19 naddy Exp $
-@conflict sleuthkit-*
-bin/jcat
-bin/jfold
-bin/jgrep
-bin/jview
-bin/jvim
-lib/jvim.hlp
-@man man/ja_JP.EUC/man1/jcat.1
-@man man/ja_JP.EUC/man1/jfold.1
-@man man/ja_JP.EUC/man1/jgrep.1
-@man man/ja_JP.EUC/man1/jvim.1
Index: less/Makefile
===================================================================
RCS file: less/Makefile
diff -N less/Makefile
--- less/Makefile 27 Nov 2014 12:26:49 -0000 1.25
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,30 +0,0 @@
-# $OpenBSD: Makefile,v 1.25 2014/11/27 12:26:49 naddy Exp $
-
-COMMENT= less + zcat + ISO-2022 - a pager similar to more and pg
-
-DISTNAME= less-332
-PKGNAME= ja-less-3.32pl2.48
-REVISION= 0
-CATEGORIES= japanese
-MASTER_SITES= ${MASTER_SITE_GNU:=less/}
-HOMEPAGE= http://www.pobox.com/~jam/less/
-
-MASTER_SITES0= ftp://ftp.big.or.jp/pub/usr2/jam/less/
-PATCHFILES= less-332-iso242.patch.gz:0 \
- less-332-iso242-243.patch.gz:0 \
- less-332-iso243-244.patch.gz:0 \
- less-332-iso244-245.patch.gz:0 \
- less-332-iso245-247.patch.gz:0 \
- less-332-iso247-248.patch.gz:0
-
-PATCH_DIST_STRIP= -p1
-
-MAINTAINER=Marc Espie <[email protected]>
-
-# BSD
-PERMIT_PACKAGE_CDROM= Yes
-WANTLIB= c ncurses
-
-CONFIGURE_STYLE= gnu dest
-
-.include <bsd.port.mk>
Index: less/distinfo
===================================================================
RCS file: less/distinfo
diff -N less/distinfo
--- less/distinfo 18 Jan 2015 03:14:17 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-SHA256 (less-332-iso242-243.patch.gz) =
BqUDmpt62faVbPStHXTYus2mPwHflvClS/DeZPlQsvo=
-SHA256 (less-332-iso242.patch.gz) =
GfQ3nZ6DlSMn5UTDqN2C3DMHrxptIoMzEbl8u228x9M=
-SHA256 (less-332-iso243-244.patch.gz) =
d7nga8cvfVBb+IuXkEe5Jo3NGmECIq5R7MfpvO0Ga1s=
-SHA256 (less-332-iso244-245.patch.gz) =
8TCGC0JYfIXBZcC/BC1JESrj7dWWoEvbMmy7FrP6scQ=
-SHA256 (less-332-iso245-247.patch.gz) =
B9oLi4VaBp34weAa3QR0YJcYuntd2Uq/4/v10yMnKhI=
-SHA256 (less-332-iso247-248.patch.gz) =
4JYiP5vI/Bh+s8XtrT19pZdIcDEKzdur/nrR+lkPYpM=
-SHA256 (less-332.tar.gz) = xrPeY8Ku1E4OTUD8tG3PaBL17PNOOGTr9PetB3xMooA=
-SIZE (less-332-iso242-243.patch.gz) = 10128
-SIZE (less-332-iso242.patch.gz) = 61306
-SIZE (less-332-iso243-244.patch.gz) = 3212
-SIZE (less-332-iso244-245.patch.gz) = 490
-SIZE (less-332-iso245-247.patch.gz) = 4597
-SIZE (less-332-iso247-248.patch.gz) = 3806
-SIZE (less-332.tar.gz) = 204926
Index: less/patches/patch-Makefile_in
===================================================================
RCS file: less/patches/patch-Makefile_in
diff -N less/patches/patch-Makefile_in
--- less/patches/patch-Makefile_in 26 Oct 2007 21:42:18 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.1 2007/10/26 21:42:18 ajacoutot Exp $
---- Makefile.in.orig Fri Oct 26 23:39:07 2007
-+++ Makefile.in Fri Oct 26 23:39:08 2007
-@@ -22,11 +22,11 @@ exec_prefix = @exec_prefix@
-
- # Where the installed binary goes.
- bindir = ${exec_prefix}/bin
--binprefix =
-+binprefix = j
-
- mandir = ${prefix}/man/man${manext}
- manext = 1
--manprefix =
-+manprefix = j
-
- #### End of system configuration section. ####
-
Index: less/pkg/DESCR
===================================================================
RCS file: less/pkg/DESCR
diff -N less/pkg/DESCR
--- less/pkg/DESCR 15 May 2007 09:24:09 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,9 +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 supports ISO 2022 code extension techniques and
-Japanese codes(EUC Japanese, SJIS) and compressed(or gzipped) file
-viewing. The author of this patch is [email protected].
Index: less/pkg/PLIST
===================================================================
RCS file: less/pkg/PLIST
diff -N less/pkg/PLIST
--- less/pkg/PLIST 15 Sep 2004 00:56:29 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,6 +0,0 @@
-@comment $OpenBSD: PLIST,v 1.3 2004/09/15 00:56:29 espie Exp $
-bin/jless
-bin/jlessecho
-bin/jlesskey
-@man man/man1/jless.1
-@man man/man1/jlesskey.1
