diff options
author | Satoshi Taoka <taoka@FreeBSD.org> | 2000-10-10 05:10:07 +0000 |
---|---|---|
committer | Satoshi Taoka <taoka@FreeBSD.org> | 2000-10-10 05:10:07 +0000 |
commit | 0c671252e29ff2032860827f327a90b4f0a8b124 (patch) | |
tree | e6782e40f98282d90524cdc165e2571fc8818115 | |
parent | Update to version 2.20 (diff) |
Make symlinks jvim3 -> jvim and jvim2 -> jvim
Each port of jvim3 and jvim3-direct_canna has a problem
when using jvim3rc in privious port. So I fixed it.
Notes
Notes:
svn path=/head/; revision=33657
-rw-r--r-- | japanese/jvim/Makefile | 1 | ||||
-rw-r--r-- | japanese/jvim/files/patch-aa | 11 | ||||
-rw-r--r-- | japanese/jvim/pkg-plist | 1 | ||||
-rw-r--r-- | japanese/jvim3/Makefile | 10 | ||||
-rw-r--r-- | japanese/jvim3/pkg-plist | 3 |
5 files changed, 23 insertions, 3 deletions
diff --git a/japanese/jvim/Makefile b/japanese/jvim/Makefile index 3290f18f3a78..0aa5d070e224 100644 --- a/japanese/jvim/Makefile +++ b/japanese/jvim/Makefile @@ -67,6 +67,7 @@ do-build: 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 \ diff --git a/japanese/jvim/files/patch-aa b/japanese/jvim/files/patch-aa index af5eaabbd3a9..36b0feb3d9d9 100644 --- a/japanese/jvim/files/patch-aa +++ b/japanese/jvim/files/patch-aa @@ -1,5 +1,5 @@ --- ./src/makefile.junx.orig Mon Jul 3 05:54:33 1995 -+++ ./src/makefile.junx Fri Oct 31 14:53:29 1997 ++++ ./src/makefile.junx Wed Oct 4 02:10:05 2000 @@ -15,12 +15,12 @@ # #>>>>> choose Japanese Kanji code @@ -39,7 +39,14 @@ 'CC = gcc -O2 -Wall' # for FreeBSD before 2.0.5R, 'LIBS = -ltermcap -lcompat' may be needed. -@@ -368,13 +375,13 @@ +@@ -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 diff --git a/japanese/jvim/pkg-plist b/japanese/jvim/pkg-plist index d0469204ebba..87574de33e7d 100644 --- a/japanese/jvim/pkg-plist +++ b/japanese/jvim/pkg-plist @@ -2,5 +2,6 @@ bin/jcat bin/jgrep bin/jfold bin/jvim +bin/jvim2 bin/jview lib/jvim.hlp diff --git a/japanese/jvim3/Makefile b/japanese/jvim3/Makefile index 097f8f803fad..7500d8878a1b 100644 --- a/japanese/jvim3/Makefile +++ b/japanese/jvim3/Makefile @@ -85,6 +85,9 @@ FEPLIBS!= echo ${FEPLIBS} | sed 's%^%-lonew${INPUT_METHOD} %' FEPOBJS= feponew.o ### .endif +PLIST_SUB+= HAS_JVIM3RC="" +.else +PLIST_SUB+= HAS_JVIM3RC="@comment " .endif post-extract: @@ -102,11 +105,18 @@ do-build: do-install: cd ${WRKSRC}/src; make -f ${MAKEFILE} install + ${LN} -sf ${PREFIX}/bin/jvim3 ${PREFIX}/bin/jvim if [ -e ${PREFIX}/etc/jvim3rc ]; then \ ${MV} ${PREFIX}/etc/jvim3rc ${PREFIX}/etc/jvim3rc.bak; \ fi ${INSTALL_PROGRAM} ${WRKSRC}/src/grep/grep ${PREFIX}/bin/jgrep +.if defined(INPUT_METHOD) +.if defined(DIRECT_CANNA) + ${ECHO} "set fepctrl" > ${PREFIX}/etc/jvim3rc +.else ${ECHO} "set fepctrl onewredraw" > ${PREFIX}/etc/jvim3rc +.endif +.endif .if !defined(NOPORTDOCS) .if defined(PORT_DOCDIR) ${MKDIR} ${PORT_DOCDIR} diff --git a/japanese/jvim3/pkg-plist b/japanese/jvim3/pkg-plist index 5e9fc4fea6ee..e6871b3eb5f6 100644 --- a/japanese/jvim3/pkg-plist +++ b/japanese/jvim3/pkg-plist @@ -1,8 +1,9 @@ +bin/jvim bin/jvim3 bin/jgrep lib/jvim3.hlp @exec ([ -f %D/etc/jvim3rc ] && mv %D/etc/jvim3rc %D/etc/jvim3rc.bak) || /usr/bin/true -etc/jvim3rc +%%HAS_JVIM3RC%%etc/jvim3rc share/doc/ja-jvim-%%VERSION%%/cygwin.txt share/doc/ja-jvim-%%VERSION%%/differen.doc share/doc/ja-jvim-%%VERSION%%/fepctrl.doc |