From 3e2d01fee6bbd35ee4de8b055572ca07f852bd22 Mon Sep 17 00:00:00 2001 From: Hiroki Sato Date: Sun, 26 Oct 2008 20:21:50 +0000 Subject: [PATCH] Remove japanese/jvim and japanese/jvim-* variants because they are no longer maintained. --- MOVED | 8 +++ japanese/Makefile | 8 --- japanese/jvim-canna+freewnn/Makefile | 16 ----- japanese/jvim-canna+freewnn/pkg-descr | 12 ---- japanese/jvim-canna+wnn6/Makefile | 16 ----- japanese/jvim-canna+wnn6/pkg-descr | 12 ---- japanese/jvim-canna+wnn7/Makefile | 15 ----- japanese/jvim-canna+wnn7/pkg-descr | 12 ---- japanese/jvim-canna/Makefile | 15 ----- japanese/jvim-canna/pkg-descr | 12 ---- japanese/jvim-freewnn/Makefile | 16 ----- japanese/jvim-freewnn/pkg-descr | 12 ---- japanese/jvim-wnn6/Makefile | 15 ----- japanese/jvim-wnn6/pkg-descr | 12 ---- japanese/jvim-wnn7/Makefile | 15 ----- japanese/jvim-wnn7/pkg-descr | 12 ---- japanese/jvim/Makefile | 87 --------------------------- japanese/jvim/distinfo | 3 - japanese/jvim/files/patch-aa | 83 ------------------------- japanese/jvim/files/patch-ab | 74 ----------------------- japanese/jvim/files/patch-ac | 12 ---- japanese/jvim/files/patch-ad | 26 -------- japanese/jvim/files/patch-src_jp.c | 28 --------- japanese/jvim/pkg-descr | 10 --- japanese/jvim/pkg-plist | 7 --- 25 files changed, 8 insertions(+), 530 deletions(-) delete mode 100644 japanese/jvim-canna+freewnn/Makefile delete mode 100644 japanese/jvim-canna+freewnn/pkg-descr delete mode 100644 japanese/jvim-canna+wnn6/Makefile delete mode 100644 japanese/jvim-canna+wnn6/pkg-descr delete mode 100644 japanese/jvim-canna+wnn7/Makefile delete mode 100644 japanese/jvim-canna+wnn7/pkg-descr delete mode 100644 japanese/jvim-canna/Makefile delete mode 100644 japanese/jvim-canna/pkg-descr delete mode 100644 japanese/jvim-freewnn/Makefile delete mode 100644 japanese/jvim-freewnn/pkg-descr delete mode 100644 japanese/jvim-wnn6/Makefile delete mode 100644 japanese/jvim-wnn6/pkg-descr delete mode 100644 japanese/jvim-wnn7/Makefile delete mode 100644 japanese/jvim-wnn7/pkg-descr delete mode 100644 japanese/jvim/Makefile delete mode 100644 japanese/jvim/distinfo delete mode 100644 japanese/jvim/files/patch-aa delete mode 100644 japanese/jvim/files/patch-ab delete mode 100644 japanese/jvim/files/patch-ac delete mode 100644 japanese/jvim/files/patch-ad delete mode 100644 japanese/jvim/files/patch-src_jp.c delete mode 100644 japanese/jvim/pkg-descr delete mode 100644 japanese/jvim/pkg-plist diff --git a/MOVED b/MOVED index dcc8fc300bff..d3aa6c11be7f 100644 --- a/MOVED +++ b/MOVED @@ -3644,3 +3644,11 @@ japanese/onew-canna+wnn7|japanese/onew|2008-10-26|Integrated into japanese/onew japanese/onew-freewnn|japanese/onew|2008-10-26|Integrated into japanese/onew japanese/onew-wnn6|japanese/onew|2008-10-26|Integrated into japanese/onew japanese/onew-wnn7|japanese/onew|2008-10-26|Integrated into japanese/onew +japanese/jvim||2008-10-26|Removed: no longer maintained. +japanese/jvim-canna||2008-10-26|Removed: no longer maintained. +japanese/jvim-canna+freewnn||2008-10-26|Removed: no longer maintained. +japanese/jvim-canna+wnn6||2008-10-26|Removed: no longer maintained. +japanese/jvim-canna+wnn7||2008-10-26|Removed: no longer maintained. +japanese/jvim-freewnn||2008-10-26|Removed: no longer maintained. +japanese/jvim-wnn6||2008-10-26|Removed: no longer maintained. +japanese/jvim-wnn7||2008-10-26|Removed: no longer maintained. diff --git a/japanese/Makefile b/japanese/Makefile index b2a107cc2b90..71c16bc4498c 100644 --- a/japanese/Makefile +++ b/japanese/Makefile @@ -110,14 +110,6 @@ SUBDIR += jmode-skk SUBDIR += jpilot SUBDIR += jstrings - SUBDIR += jvim - SUBDIR += jvim-canna - SUBDIR += jvim-canna+freewnn - SUBDIR += jvim-canna+wnn6 - SUBDIR += jvim-canna+wnn7 - SUBDIR += jvim-freewnn - SUBDIR += jvim-wnn6 - SUBDIR += jvim-wnn7 SUBDIR += jvim3 SUBDIR += jvim3-canna SUBDIR += jvim3-canna+freewnn diff --git a/japanese/jvim-canna+freewnn/Makefile b/japanese/jvim-canna+freewnn/Makefile deleted file mode 100644 index bdf2aceb5ef4..000000000000 --- a/japanese/jvim-canna+freewnn/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# New ports collection makefile for: jvim for Canna and FreeWnn -# Date created: 5 Sep 1997 -# Whom: Satoshi TAOKA -# -# $FreeBSD$ -# - -PKGNAMESUFFIX= -canna+freewnn -COMMENT= Japanized Vim (with Canna and FreeWnn) -CANNA= yes -FREEWNN= yes - -MASTERDIR= ${.CURDIR}/../jvim -PKGDIR= ${.CURDIR} - -.include "${MASTERDIR}/Makefile" diff --git a/japanese/jvim-canna+freewnn/pkg-descr b/japanese/jvim-canna+freewnn/pkg-descr deleted file mode 100644 index eae122b4e747..000000000000 --- a/japanese/jvim-canna+freewnn/pkg-descr +++ /dev/null @@ -1,12 +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. - -This package is built with Japanese support, using Canna and FreeWnn. - -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 - diff --git a/japanese/jvim-canna+wnn6/Makefile b/japanese/jvim-canna+wnn6/Makefile deleted file mode 100644 index 79f1bbc905eb..000000000000 --- a/japanese/jvim-canna+wnn6/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# New ports collection makefile for: jvim for Canna and Wnn6 -# Date created: 5 Sep 1997 -# Whom: Satoshi TAOKA -# -# $FreeBSD$ -# - -PKGNAMESUFFIX= -canna+wnn6 -COMMENT= Japanized Vim (with Canna and Wnn6) -CANNA= yes -WNN6= yes - -MASTERDIR= ${.CURDIR}/../jvim -PKGDIR= ${.CURDIR} - -.include "${MASTERDIR}/Makefile" diff --git a/japanese/jvim-canna+wnn6/pkg-descr b/japanese/jvim-canna+wnn6/pkg-descr deleted file mode 100644 index c3fe6a38f78f..000000000000 --- a/japanese/jvim-canna+wnn6/pkg-descr +++ /dev/null @@ -1,12 +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. - -This package is built with Japanese support, using Canna and Wnn6. - -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 - diff --git a/japanese/jvim-canna+wnn7/Makefile b/japanese/jvim-canna+wnn7/Makefile deleted file mode 100644 index 23b161ca34bd..000000000000 --- a/japanese/jvim-canna+wnn7/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# New ports collection makefile for: jvim for Canna and Wnn7 -# Date created: 01/07/18 -# Whom: Satoshi TAOKA -# -# $FreeBSD$ -# - -COMMENT= Japanized Vim (with Canna and Wnn7) -CANNA= yes -WNN7= yes - -MASTERDIR= ${.CURDIR}/../jvim -PKGDIR= ${.CURDIR} - -.include "${MASTERDIR}/Makefile" diff --git a/japanese/jvim-canna+wnn7/pkg-descr b/japanese/jvim-canna+wnn7/pkg-descr deleted file mode 100644 index 2894726bcdf9..000000000000 --- a/japanese/jvim-canna+wnn7/pkg-descr +++ /dev/null @@ -1,12 +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. - -This package is built with Japanese support, using Canna and Wnn7. - -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 - diff --git a/japanese/jvim-canna/Makefile b/japanese/jvim-canna/Makefile deleted file mode 100644 index d349b59e9cc6..000000000000 --- a/japanese/jvim-canna/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# New ports collection makefile for: jvim for Canna -# Date created: 5 Sep 1997 -# Whom: Satoshi TAOKA -# -# $FreeBSD$ -# - -PKGNAMESUFFIX= -canna -COMMENT= Japanized Vim (with Canna) -CANNA= yes - -MASTERDIR= ${.CURDIR}/../jvim -PKGDIR= ${.CURDIR} - -.include "${MASTERDIR}/Makefile" diff --git a/japanese/jvim-canna/pkg-descr b/japanese/jvim-canna/pkg-descr deleted file mode 100644 index 2b097a639063..000000000000 --- a/japanese/jvim-canna/pkg-descr +++ /dev/null @@ -1,12 +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. - -This package is built with Japanese support, using Canna as default. - -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 - diff --git a/japanese/jvim-freewnn/Makefile b/japanese/jvim-freewnn/Makefile deleted file mode 100644 index cee4adb18af0..000000000000 --- a/japanese/jvim-freewnn/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# New ports collection makefile for: jvim for FreeWnn -# Date created: 5 Sep 1997 -# Whom: Satoshi TAOKA -# -# $FreeBSD$ -# - -PKGNAMESUFFIX= -freewnn -COMMENT= Japanized Vim (with FreeWnn) - -FREEWNN= yes - -MASTERDIR= ${.CURDIR}/../jvim -PKGDIR= ${.CURDIR} - -.include "${MASTERDIR}/Makefile" diff --git a/japanese/jvim-freewnn/pkg-descr b/japanese/jvim-freewnn/pkg-descr deleted file mode 100644 index 34be58ae2920..000000000000 --- a/japanese/jvim-freewnn/pkg-descr +++ /dev/null @@ -1,12 +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. - -This package is built with Japanese support, using FreeWnn as default. - -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 - diff --git a/japanese/jvim-wnn6/Makefile b/japanese/jvim-wnn6/Makefile deleted file mode 100644 index 665fc277970e..000000000000 --- a/japanese/jvim-wnn6/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# New ports collection makefile for: jvim for Wnn6 -# Date created: 5 Sep 1997 -# Whom: Satoshi TAOKA -# -# $FreeBSD$ -# - -PKGNAMESUFFIX= -wnn6 -COMMENT= Japanized Vim (with Wnn6) -WNN6= yes - -MASTERDIR= ${.CURDIR}/../jvim -PKGDIR= ${.CURDIR} - -.include "${MASTERDIR}/Makefile" diff --git a/japanese/jvim-wnn6/pkg-descr b/japanese/jvim-wnn6/pkg-descr deleted file mode 100644 index 8b8705ac9626..000000000000 --- a/japanese/jvim-wnn6/pkg-descr +++ /dev/null @@ -1,12 +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. - -This package is built with Japanese support, using Wnn6 as default. - -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 - diff --git a/japanese/jvim-wnn7/Makefile b/japanese/jvim-wnn7/Makefile deleted file mode 100644 index 31d4392b99e0..000000000000 --- a/japanese/jvim-wnn7/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# New ports collection makefile for: jvim for Wnn7 -# Date created: 01/07/18 -# Whom: Satoshi TAOKA -# -# $FreeBSD$ -# - -COMMENT= Japanized Vim (with Wnn7) - -WNN7= yes - -MASTERDIR= ${.CURDIR}/../jvim -PKGDIR= ${.CURDIR} - -.include "${MASTERDIR}/Makefile" diff --git a/japanese/jvim-wnn7/pkg-descr b/japanese/jvim-wnn7/pkg-descr deleted file mode 100644 index 12dfb2918242..000000000000 --- a/japanese/jvim-wnn7/pkg-descr +++ /dev/null @@ -1,12 +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. - -This package is built with Japanese support, using Wnn7 as default. - -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 - diff --git a/japanese/jvim/Makefile b/japanese/jvim/Makefile deleted file mode 100644 index 378e1f6c8c8a..000000000000 --- a/japanese/jvim/Makefile +++ /dev/null @@ -1,87 +0,0 @@ -# New ports collection makefile for: jvim -# Date created: 5 Sep 1997 -# Whom: Satoshi TAOKA -# -# $FreeBSD$ -# - -PORTNAME= jvim -PORTVERSION= 2.0r -PKGNAMESUFFIX= ${INPUT_METHOD} -CATEGORIES= japanese editors -MASTER_SITES= ftp://ftp.lab.kdd.co.jp/Japan/onew/ \ - ftp://ftp.leo.chubu.ac.jp/pub/editor/jvim/ -DISTNAME= ${PORTNAME}${PORTVERSION}+onew2.2.10 - -MAINTAINER= ports@FreeBSD.org -COMMENT?= Japanized Vim - -PATCHDIR= ${.CURDIR}/../jvim/files -FILESDIR= ${.CURDIR}/../jvim/files -PLIST= ${.CURDIR}/../jvim/pkg-plist -MANLANG= ja -MAN1= jcat.1 jfold.1 jgrep.1 jvim.1 -WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION} - -# Specifying a velue INPUT_METHOD, and seting values BUILD_DEPENDS, -# LIB_DEPENDS, etc. -.if defined(CANNA) -INPUT_METHOD+= canna -LIB_DEPENDS+= canna.1:${PORTSDIR}/japanese/Canna -JPLIB+= -lcanna -.endif -.if defined(FREEWNN) -INPUT_METHOD+= freewnn -LIB_DEPENDS+= jd.0:${PORTSDIR}/japanese/FreeWnn-lib -RUN_DEPENDS+= ${LOCALBASE}/lib/wnn/ja_JP/rk/2B_ROMKANA:${PORTSDIR}/japanese/FreeWnn-lib -JPDEF+= -DWNN_ISDIR -JPLIB+= -ljd -lcrypt -.elif defined(WNN6) -INPUT_METHOD+= wnn6 -LIB_DEPENDS+= jd.0:${PORTSDIR}/japanese/FreeWnn-lib -RUN_DEPENDS+= ${LOCALBASE}/lib/wnn/ja_JP/rk.wnn6/2B_ROMKANA:${PORTSDIR}/japanese/onew${INPUT_METHOD} -JPDEF+= -DWNN_ISDIR -JPLIB+= -ljd -lcrypt -.elif defined(WNN7) -INPUT_METHOD+= wnn7 -LIB_DEPENDS+= jd.0:${PORTSDIR}/japanese/FreeWnn-lib -RUN_DEPENDS+= ${LOCALBASE}/lib/wnn/ja_JP/rk.wnn7/2B_ROMKANA:${PORTSDIR}/japanese/onew${INPUT_METHOD} -JPDEF+= -DWNN_ISDIR -JPLIB+= -ljd -lcrypt -.endif - -.include -# -# Make a value of INPUT_METHOD -.if defined(INPUT_METHOD) -INPUT_METHOD!= ${ECHO_CMD} ${INPUT_METHOD} | sed -e 's/^/-/' -e 's/ /+/g' -.endif -# -# For ONEW library -.if defined(INPUT_METHOD) -BUILD_DEPENDS+= ${LOCALBASE}/lib/libonew${INPUT_METHOD}.a:${PORTSDIR}/japanese/onew${INPUT_METHOD} -JPDEF+= -DONEW -# If we use ONEW libray, then -lonew*.a should appear -# before the other libraries. -JPLIB!= ${ECHO_CMD} ${JPLIB} | sed 's%^%-lonew${INPUT_METHOD} %' -.endif - -pre-build: - cd ${WRKSRC}/src; \ - ${SED} -e 's,%LOCALBASE%,${LOCALBASE},g' \ - -e 's,%LOCALBASE%,${LOCALBASE},g' \ - ./makefile.junx > Makefile; \ - -do-build: - cd ${WRKSRC}/src; make FreeBSD 'JPDEF=${JPDEF}' 'JPLIB=${JPLIB}' - -do-install: - cd ${WRKSRC}/src; make install - ${LN} -sf ${PREFIX}/bin/jvim2 ${PREFIX}/bin/jvim - -post-install: - for file in jcat jgrep jfold jvim; do \ - strip ${LOCALBASE}/bin/$$file; \ - done - -.include diff --git a/japanese/jvim/distinfo b/japanese/jvim/distinfo deleted file mode 100644 index dda478ca15b4..000000000000 --- a/japanese/jvim/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (jvim2.0r+onew2.2.10.tar.gz) = 42e04a80f3dbdfca4fbe8b9e634d1380 -SHA256 (jvim2.0r+onew2.2.10.tar.gz) = 8cddd0bd98fa39ef6bda38d5fd5c00f791a42e4d11f75ef2db5fd6b5bd34a9f6 -SIZE (jvim2.0r+onew2.2.10.tar.gz) = 569300 diff --git a/japanese/jvim/files/patch-aa b/japanese/jvim/files/patch-aa deleted file mode 100644 index 5a0b40f44e37..000000000000 --- a/japanese/jvim/files/patch-aa +++ /dev/null @@ -1,83 +0,0 @@ ---- ./src/makefile.junx.orig Mon Jul 3 05:54:33 1995 -+++ ./src/makefile.junx Wed Oct 4 02:10:05 2000 -@@ -15,12 +15,12 @@ - # - #>>>>> 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 @@ - -L/usr/X386/lib \ - -L/usr/local/X11R5/lib \ - -L/usr/local/lib \ -- -L/usr/lib -+ -L/usr/lib \ -+ -L%LOCALBASE%/lib \ -+ -L%LOCALBASE%/lib \ -+ -L/usr/X11R6/lib -+ -+INSTALL_MAN?= install -c -m ${MANMOD} -+ - ###################################################################### - - all: -@@ -183,6 +189,7 @@ - @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. -@@ -362,19 +369,19 @@ - - #>>>>> choose options for install - ### Name of target --JVIM = jvim -+JVIM = jvim2 - JCAT = jcat - 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/ja - MANLOC = $(MANDIR)/man1 - - ### Location of help file -@@ -500,14 +507,10 @@ - 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) diff --git a/japanese/jvim/files/patch-ab b/japanese/jvim/files/patch-ab deleted file mode 100644 index 42fd87d9cf6b..000000000000 --- a/japanese/jvim/files/patch-ab +++ /dev/null @@ -1,74 +0,0 @@ ---- ./src/jgrep.c.orig Mon Jul 3 23:52:28 1995 -+++ ./src/jgrep.c Fri Sep 5 14:01:32 1997 -@@ -38,17 +38,19 @@ - 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 ann@mrit.mei.co.jp\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 \\.\n"); - fprintf(stderr, " -C Print kanji code.\n"); - fprintf(stderr, " -N -J -E -S -X \n"); -@@ -104,7 +106,7 @@ - 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 @@ - o_noerr = TRUE; - break; - -+ case 'n': -+ o_sline = TRUE; -+ break; -+ - case 'v': - o_nomat = TRUE; - break; -@@ -268,9 +274,11 @@ - char *fname; - { - int count; -+ int nline; - - reg_ic = o_icase; - count = 0; -+ nline = 0; - - reset_jcount(); - -@@ -282,6 +290,9 @@ - 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 @@ - { - if (fname) - printf("%s:", fname); -+ if (o_sline) -+ printf("%d:", nline); - if (o_scode) - printf("(%c)", judge_jcode(jread)); - if (o_nonly) diff --git a/japanese/jvim/files/patch-ac b/japanese/jvim/files/patch-ac deleted file mode 100644 index 28d8baf5cf3f..000000000000 --- a/japanese/jvim/files/patch-ac +++ /dev/null @@ -1,12 +0,0 @@ ---- src/term.c.orig Fri Jun 30 12:32:40 1995 -+++ src/term.c Thu Aug 27 18:02:42 1998 -@@ -176,7 +176,9 @@ - T_DL = tgetstr("dl", &tp); - T_CDL = tgetstr("DL", &tp); - T_ED = tgetstr("cl", &tp); -+#ifndef __FreeBSD__ /* by Satoshi TAOKA */ - T_CI = tgetstr("vi", &tp); -+#endif - T_CV = tgetstr("ve", &tp); - T_TP = tgetstr("me", &tp); - T_TI = tgetstr("mr", &tp); diff --git a/japanese/jvim/files/patch-ad b/japanese/jvim/files/patch-ad deleted file mode 100644 index 13d2b454dce5..000000000000 --- a/japanese/jvim/files/patch-ad +++ /dev/null @@ -1,26 +0,0 @@ ---- jgrep.1.orig Sun Oct 10 21:46:18 1999 -+++ doc/jgrep.1 Sun Oct 10 21:48:40 1999 -@@ -80,17 +80,17 @@ - .B . - 日本語/英語1文字とマッチします。 - .TP --.B \[ \], \[^ \] -+.B \&[ \&], \&[^ \&] - 指定された日本語とマッチします。次のようなパターンを指定することもできます。 - .br - .nf - .sp - .lf --\[ぁ-ん\] : 平仮名 --\[ァ-ヶ\] : 片仮名 --\[０-９\] : JIS X0208数字 --\[Ａ-Ｚ\] : JIS X0208英大文字 --\[α-ω\] : JIS X0208ギリシャ小文字 -+\&[ぁ\&-ん\&] : 平仮名 -+\&[ァ\&-ヶ\&] : 片仮名 -+\&[０\&-９\&] : JIS X0208数字 -+\&[Ａ\&-Ｚ\&] : JIS X0208英大文字 -+\&[α\&-ω\&] : JIS X0208ギリシャ小文字 - .lf - .fi - .br diff --git a/japanese/jvim/files/patch-src_jp.c b/japanese/jvim/files/patch-src_jp.c deleted file mode 100644 index 76774cfc0984..000000000000 --- a/japanese/jvim/files/patch-src_jp.c +++ /dev/null @@ -1,28 +0,0 @@ ---- src/jp.c.orig 2007-11-05 07:53:44.000000000 -0500 -+++ src/jp.c 2007-11-05 07:54:18.000000000 -0500 -@@ -27,6 +27,7 @@ - #if defined(UNIX) && !defined(GENERAL) - #include "signal.h" - -+ static void abend_handler(); - /* - * handle core dump by some bugs. - */ -@@ -34,7 +35,6 @@ - core_handler(dummy) - int dummy; - { -- static void abend_handler(); - abend_handler(TRUE); - } - -@@ -42,7 +42,6 @@ - hup_handler(dummy) - int dummy; - { -- static void abend_handler(); - abend_handler(FALSE); - } - - - diff --git a/japanese/jvim/pkg-descr b/japanese/jvim/pkg-descr deleted file mode 100644 index d02ac057a15c..000000000000 --- a/japanese/jvim/pkg-descr +++ /dev/null @@ -1,10 +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 - diff --git a/japanese/jvim/pkg-plist b/japanese/jvim/pkg-plist deleted file mode 100644 index 87574de33e7d..000000000000 --- a/japanese/jvim/pkg-plist +++ /dev/null @@ -1,7 +0,0 @@ -bin/jcat -bin/jgrep -bin/jfold -bin/jvim -bin/jvim2 -bin/jview -lib/jvim.hlp