1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-30 05:40:06 +00:00

- Simplify japanese/jvim3-* variants into a single japanese/jvim3.

- OPTIONify Japanese backend support selection.
This commit is contained in:
Hiroki Sato 2008-10-28 15:09:25 +00:00
parent 25d4465496
commit 8123cc8887
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=222158
21 changed files with 89 additions and 356 deletions

8
MOVED
View File

@ -3652,3 +3652,11 @@ 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.
japanese/jvim3-canna|japanese/jvim3|2008-10-28|Integrated into japanese/jvim3
japanese/jvim3-canna+freewnn|japanese/jvim3|2008-10-28|Integrated into japanese/jvim3
japanese/jvim3-canna+wnn6|japanese/jvim3|2008-10-28|Integrated into japanese/jvim3
japanese/jvim3-canna+wnn7|japanese/jvim3|2008-10-28|Integrated into japanese/jvim3
japanese/jvim3-direct_canna|japanese/jvim3|2008-10-28|Integrated into japanese/jvim3
japanese/jvim3-freewnn|japanese/jvim3|2008-10-28|Integrated into japanese/jvim3
japanese/jvim3-wnn6|japanese/jvim3|2008-10-28|Integrated into japanese/jvim3
japanese/jvim3-wnn7|japanese/jvim3|2008-10-28|Integrated into japanese/jvim3

View File

@ -111,14 +111,6 @@
SUBDIR += jpilot
SUBDIR += jstrings
SUBDIR += jvim3
SUBDIR += jvim3-canna
SUBDIR += jvim3-canna+freewnn
SUBDIR += jvim3-canna+wnn6
SUBDIR += jvim3-canna+wnn7
SUBDIR += jvim3-direct_canna
SUBDIR += jvim3-freewnn
SUBDIR += jvim3-wnn6
SUBDIR += jvim3-wnn7
SUBDIR += jyuroku
SUBDIR += k10
SUBDIR += k12

View File

@ -1,16 +0,0 @@
# New ports collection makefile for: jvim3 for Canna and FreeWnn
# Date created: 98/11/17
# Whom: Satoshi TAOKA <taoka@FreeBSD.org>
#
# $FreeBSD$
#
COMMENT= Japanized Vim-3.0 (with Canna and FreeWnn)
CANNA= yes
FREEWNN= yes
MASTERDIR= ${.CURDIR}/../jvim3
PKGDIR= ${.CURDIR}
.include "${MASTERDIR}/Makefile"

View File

@ -1,14 +0,0 @@
JVim 3.0 is a text editor that is upwards compatible to vi. It can be
used to edit any ASCII and Japanese(SJIS/JIS/EUC/Unicode) 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
<taoka@FreeBSD.org>
WWW: http://hp.vector.co.jp/authors/VA003457/vim/

View File

@ -1,16 +0,0 @@
# New ports collection makefile for: jvim3 for Canna and Wnn6
# Date created: 98/11/17
# Whom: Satoshi TAOKA <taoka@FreeBSD.org>
#
# $FreeBSD$
#
COMMENT= Japanized Vim-3.0 (with Canna and Wnn6)
CANNA= yes
WNN6= yes
MASTERDIR= ${.CURDIR}/../jvim3
PKGDIR= ${.CURDIR}
.include "${MASTERDIR}/Makefile"

View File

@ -1,14 +0,0 @@
JVim 3.0 is a text editor that is upwards compatible to vi. It can be
used to edit any ASCII and Japanese(SJIS/JIS/EUC/Unicode) 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
<taoka@FreeBSD.org>
WWW: http://hp.vector.co.jp/authors/VA003457/vim/

View File

@ -1,16 +0,0 @@
# New ports collection makefile for: jvim3 for Canna and Wnn7
# Date created: 01/07/18
# Whom: Satoshi TAOKA <taoka@FreeBSD.org>
#
# $FreeBSD$
#
COMMENT= Japanized Vim-3.0 (with Canna and Wnn7)
CANNA= yes
WNN7= yes
MASTERDIR= ${.CURDIR}/../jvim3
PKGDIR= ${.CURDIR}
.include "${MASTERDIR}/Makefile"

View File

@ -1,14 +0,0 @@
JVim 3.0 is a text editor that is upwards compatible to vi. It can be
used to edit any ASCII and Japanese(SJIS/JIS/EUC/Unicode) 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
<taoka@FreeBSD.org>
WWW: http://hp.vector.co.jp/authors/VA003457/vim/

View File

@ -1,15 +0,0 @@
# New ports collection makefile for: jvim3 for Canna
# Date created: 98/11/17
# Whom: Satoshi TAOKA <taoka@FreeBSD.org>
#
# $FreeBSD$
#
COMMENT= Japanized Vim-3.0 (with Canna)
CANNA= yes
MASTERDIR= ${.CURDIR}/../jvim3
PKGDIR= ${.CURDIR}
.include "${MASTERDIR}/Makefile"

View File

@ -1,14 +0,0 @@
JVim 3.0 is a text editor that is upwards compatible to vi. It can be
used to edit any ASCII and Japanese(SJIS/JIS/EUC/Unicode) text. It is
especially useful for editing programs.
This package is built with Japanese support, using Canna.
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
<taoka@FreeBSD.org>
WWW: http://hp.vector.co.jp/authors/VA003457/vim/

View File

@ -1,15 +0,0 @@
# New ports collection makefile for: jvim3 for Canna without ONEW library
# Date created: 98/11/17
# Whom: Satoshi TAOKA <taoka@FreeBSD.org>
#
# $FreeBSD$
#
COMMENT= Japanized Vim-3.0 (direct connection to Canna)
DIRECT_CANNA= yes
MASTERDIR= ${.CURDIR}/../jvim3
PKGDIR= ${.CURDIR}
.include "${MASTERDIR}/Makefile"

View File

@ -1,15 +0,0 @@
JVim 3.0 is a text editor that is upwards compatible to vi. It can be
used to edit any ASCII and Japanese(SJIS/JIS/EUC/Unicode) text. It is
especially useful for editing programs.
This package is built with Japanese support, using Canna without ONEW
library (that is, it means this connects to Canna directly).
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
<taoka@FreeBSD.org>
WWW: http://hp.vector.co.jp/authors/VA003457/vim/

View File

@ -1,15 +0,0 @@
# New ports collection makefile for: jvim3 for FreeWnn
# Date created: 98/11/17
# Whom: Satoshi TAOKA <taoka@FreeBSD.org>
#
# $FreeBSD$
#
COMMENT= Japanized Vim-3.0 (with FreeWnn)
FREEWNN= yes
MASTERDIR= ${.CURDIR}/../jvim3
PKGDIR= ${.CURDIR}
.include "${MASTERDIR}/Makefile"

View File

@ -1,14 +0,0 @@
JVim 3.0 is a text editor that is upwards compatible to vi. It can be
used to edit any ASCII and Japanese(SJIS/JIS/EUC/Unicode) text. It is
especially useful for editing programs.
This package is built with Japanese support, using 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
<taoka@FreeBSD.org>
WWW: http://hp.vector.co.jp/authors/VA003457/vim/

View File

@ -1,15 +0,0 @@
# New ports collection makefile for: jvim3 for Wnn6
# Date created: 98/11/17
# Whom: Satoshi TAOKA <taoka@FreeBSD.org>
#
# $FreeBSD$
#
COMMENT= Japanized Vim-3.0 (with Wnn6)
WNN6= yes
MASTERDIR= ${.CURDIR}/../jvim3
PKGDIR= ${.CURDIR}
.include "${MASTERDIR}/Makefile"

View File

@ -1,14 +0,0 @@
JVim 3.0 is a text editor that is upwards compatible to vi. It can be
used to edit any ASCII and Japanese(SJIS/JIS/EUC/Unicode) text. It is
especially useful for editing programs.
This package is built with Japanese support, using 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
<taoka@FreeBSD.org>
WWW: http://hp.vector.co.jp/authors/VA003457/vim/

View File

@ -1,15 +0,0 @@
# New ports collection makefile for: jvim3 for Wnn7
# Date created: 01/07/18
# Whom: Satoshi TAOKA <taoka@FreeBSD.org>
#
# $FreeBSD$
#
COMMENT= Japanized Vim-3.0 (with Wnn7)
WNN7= yes
MASTERDIR= ${.CURDIR}/../jvim3
PKGDIR= ${.CURDIR}
.include "${MASTERDIR}/Makefile"

View File

@ -1,14 +0,0 @@
JVim 3.0 is a text editor that is upwards compatible to vi. It can be
used to edit any ASCII and Japanese(SJIS/JIS/EUC/Unicode) text. It is
especially useful for editing programs.
This package is built with Japanese support, using 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
<taoka@FreeBSD.org>
WWW: http://hp.vector.co.jp/authors/VA003457/vim/

View File

@ -7,36 +7,47 @@
PORTNAME= jvim
PORTVERSION= 3.0.j2.1a
PORTREVISION= 3
PKGNAMESUFFIX= ${INPUT_METHOD}
PORTREVISION= 4
CATEGORIES= japanese editors
MASTER_SITES= ftp://ftp.vim.org/pub/vim/unix/ \
http://hp.vector.co.jp/authors/VA003457/vim/vim3/2.1a/
DISTFILES= vim-3.0.tar.gz \
${JPATCH}
DISTFILES= vim-3.0.tar.gz jvim.2.1a.tar.gz
MAINTAINER= ports@FreeBSD.org
COMMENT?= Japanized Vim-3.0
COMMENT= Japanized Vim-3.0
NO_LATEST_LINK= YES # waiting for jgrep, jfold, jcat
PATCHDIR= ${.CURDIR}/../jvim3/files
FILESDIR= ${.CURDIR}/../jvim3/files
PLIST= ${.CURDIR}/../jvim3/pkg-plist
EXTRACT_ONLY= vim-3.0.tar.gz
EXTRA_PATCHES= ${WRKDIR}/${PORTNAME}.diff
WRKSRC= ${WRKDIR}/vim
BUILD_WRKSRC= ${WRKSRC}/src
INSTALL_WRKSRC= ${WRKSRC}/src
MAKEFILE= makjunix.mak
ALL_TARGET= # empty
PLIST_SUB= VERSION=${PORTVERSION}
MAKE_ARGS= FEPOPT='${FEPOPT}' \
FEPLIBS="${FEPLIBS}" \
FEPOBJS="${FEPOBJS}" \
MACHINE="${MACHINE}" \
CC="${CC}" \
LIBS="${LIBS}"
MAN1= jvim3.1
.include <bsd.port.pre.mk>
OPTIONS= X11 "X11 support" on \
CANNA "Canna support (via ONEW library)" on \
DIRECT_CANNA "Canna support (direct)" off \
FREEWNN "FreeWnn support (via ONEW library)" on \
WNN6 "Wnn6 support" off \
WNN7 "Wnn7 support" off
PORTDOCS= cygwin.txt differen.doc fepctrl.doc readme.doc \
termcap.dos uganda.jp vim-jp.htm vim32.ini tutor.j
JPATCH= jvim.2.1a.tar.gz
PLIST_SUB= VERSION=${PORTVERSION}
PORT_DOCDIR= ${PREFIX}/share/doc/ja-jvim-${PORTVERSION}
# -DUSE_X11 is the cause of a problem treating Japanese
MACHINE= -DBSD_UNIX -DUSE_LOCALE
CC= cc ${CFLAGS} -Wall
LIBS= -ltermlib -L${PREFIX}/lib
.include <bsd.port.pre.mk>
.if !defined(WITHOUT_X11)
USE_XORG= x11
MACHINE+= -DUSE_X11
@ -44,101 +55,70 @@ CC+= -I${LOCALBASE}/include
LIBS+= -L${LOCALBASE}/lib -lX11
.endif
# Specifying a velue INPUT_METHOD, and seting values BUILD_DEPENDS,
# LIB_DEPENDS, etc.
FEPOPT= -DJP_DEF=\"EEE\"
#######
# Direct connection to Canna
#######
.if defined(DIRECT_CANNA)
.if !defined(WITHOUT_DIRECT_CANNA)
INPUT_METHOD+= direct_canna
LIB_DEPENDS+= canna.1:${PORTSDIR}/japanese/canna-lib
FEPOPT+= -DCANNA
FEPOPT+= -DJP_DEF=\"EEE\" -DCANNA -DFEPCTRL
FEPLIBS= -lcanna
FEPOBJS= fepcanna.o
.else # DIRECT_CANNA
#######
JVIM3RC= "set fepctrl"
.else # !WITHOUT_DIRECT_CANNA
# Connection by using ONEW library
#######
.if defined(CANNA)
.if !defined(WITHOUT_CANNA)
INPUT_METHOD+= canna
LIB_DEPENDS+= canna.1:${PORTSDIR}/japanese/canna-lib
FEPLIBS+= -lcanna
.endif
.if defined(FREEWNN)
INPUT_METHOD+= freewnn
LIB_DEPENDS+= jd.0:${PORTSDIR}/japanese/FreeWnn-lib
FEPLIBS+= -L${LOCALBASE}/lib -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
FEPLIBS+= -L${LOCALBASE}/lib -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
FEPLIBS+= -L${LOCALBASE}/lib -ljd -lcrypt
.endif
.endif # DIRECT_CANNA
#
.if defined(INPUT_METHOD)
# Make a value of INPUT_METHOD
## 'sed' in the next line cannot be replaced with '${SED}'
INPUT_METHOD!= ${ECHO_CMD} ${INPUT_METHOD} | sed -e 's/^/-/' -e 's/ /+/g'
FEPOPT+= -DFEPCTRL
.if !defined(DIRECT_CANNA)
# For ONEW library
BUILD_DEPENDS+= ${LOCALBASE}/lib/libonew${INPUT_METHOD}.a:${PORTSDIR}/japanese/onew
FEPOPT+= -DONEW
# If we use ONEW libray, then -lonew-* needs appear
# before the other libraries in ${FEPLIBS}.
## 'sed' in the next line cannot be replaced with '${SED}'
FEPLIBS!= ${ECHO_CMD} ${FEPLIBS} | sed 's%^%-lonew${INPUT_METHOD} %'
FEPLIBS+= -L${LOCALBASE}/lib -lonew-canna -lcanna
FEPOPT+= -DJP_DEF=\"EEE\" -DONEW -DFEPCTRL
FEPOBJS= feponew.o
###
.endif
PLIST_SUB+= HAS_JVIM3RC=""
.else
PLIST_SUB+= HAS_JVIM3RC="@comment "
JVIM3RC= "set fepctrl onewredraw"
.endif
post-extract:
${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}${JPATCH} \
${EXTRACT_AFTER_ARGS} -C ${WRKSRC}
.if !defined(WITHOUT_FREEWNN)
LIB_DEPENDS+= jd.0:${PORTSDIR}/japanese/FreeWnn-lib
BUILD_DEPENDS+= ${LOCALBASE}/lib/libonew-freewnn.a:${PORTSDIR}/japanese/onew
FEPLIBS+= -L${LOCALBASE}/lib -lonew-freewnn -ljd -lcrypt
FEPOPT+= -DJP_DEF=\"EEE\" -DONEW -DFEPCTRL
FEPOBJS= feponew.o
JVIM3RC= "set fepctrl onewredraw"
.endif
pre-patch:
cd ${WRKSRC}; ${PATCH} ${PATCH_DIST_ARGS} < ${WRKSRC}/jvim.diff
.if !defined(WITHOUT_WNN6)
LIB_DEPENDS+= jd.0:${PORTSDIR}/japanese/FreeWnn-lib
BUILD_DEPENDS+= ${LOCALBASE}/lib/libonew-wnn6.a:${PORTSDIR}/japanese/onew
FEPLIBS+= -L${LOCALBASE}/lib -lonew-wnn6 -ljd -lcrypt
FEPOPT+= -DJP_DEF=\"EEE\" -DONEW -DFEPCTRL
FEPOBJS= feponew.o
JVIM3RC= "set fepctrl onewredraw"
.endif
do-build:
cd ${WRKSRC}/src; \
make -f ${MAKEFILE} 'FEPOPT=${FEPOPT}' 'FEPLIBS=${FEPLIBS}' \
'FEPOBJS=${FEPOBJS}' 'MACHINE=${MACHINE}' 'CC=${CC}' \
'LIBS=${LIBS}'
.if !defined(WITHOUT_WNN7)
LIB_DEPENDS+= jd.0:${PORTSDIR}/japanese/FreeWnn-lib
BUILD_DEPENDS+= ${LOCALBASE}/lib/libonew-wnn7.a:${PORTSDIR}/japanese/onew
FEPLIBS+= -L${LOCALBASE}/lib -lonew-wnn7 -ljd -lcrypt
FEPOPT+= -DJP_DEF=\"EEE\" -DONEW -DFEPCTRL
FEPOBJS= feponew.o
JVIM3RC= "set fepctrl onewredraw"
.endif
.endif # !WITHOUT_DIRECT_CANNA
do-install:
cd ${WRKSRC}/src; make -f ${MAKEFILE} install
post-build:
${CP} ${WRKSRC}/doc.j/tutor/tutor.j ${WRKSRC}/doc.j
post-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_CMD} "set fepctrl" > ${PREFIX}/etc/jvim3rc
.else
${ECHO_CMD} "set fepctrl onewredraw" > ${PREFIX}/etc/jvim3rc
.if defined(JVIM3RC)
${ECHO_CMD} "${JVIM3RC}" > ${WRKSRC}/jvim3rc.dist
${INSTALL_DATA} ${WRKSRC}/jvim3rc.dist ${PREFIX}/etc/
.endif
.if !exists(${PREFIX}/etc/jvim3rc)
${INSTALL_DATA} ${PREFIX}/etc/jvim3rc.dist ${PREFIX}/etc/jvim3rc
.endif
.if !defined(NOPORTDOCS)
.if defined(PORT_DOCDIR)
${MKDIR} ${PORT_DOCDIR}
for file in cygwin.txt differen.doc fepctrl.doc readme.doc \
termcap.dos uganda.jp vim-jp.htm vim32.ini tutor/tutor.j ; do \
${INSTALL_DATA} ${WRKSRC}/doc.j/$$file ${PORT_DOCDIR}; \
done
.endif
${MKDIR} ${DOCSDIR}
cd ${WRKSRC}/doc.j && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
.endif
.include <bsd.port.post.mk>

View File

@ -1,12 +1,9 @@
JVim 3.0 is a text editor that is upwards compatible to vi. It can be
used to edit any ASCII and Japanese(SJIS/JIS/EUC/Unicode) text. It is
especially useful for editing programs.
JVim 3.0 is a text editor with upward-compatibility to vi. It can
handle both ASCII and Japanese(SJIS/JIS/EUC/Unicode) text, and
has useful feature for editing source code.
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
<taoka@FreeBSD.org>
It has a lot of enhancements compared to the normal vi: multi level undo,
command line editing, filename completion, online help, quoting, etc..
Read difference.doc for a summary of the differences between vi and Vim.
WWW: http://hp.vector.co.jp/authors/VA003457/vim/

View File

@ -1,16 +1,8 @@
@comment $FreeBSD$
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
%%HAS_JVIM3RC%%etc/jvim3rc
%%PORTDOCS%%share/doc/ja-jvim-%%VERSION%%/cygwin.txt
%%PORTDOCS%%share/doc/ja-jvim-%%VERSION%%/differen.doc
%%PORTDOCS%%share/doc/ja-jvim-%%VERSION%%/fepctrl.doc
%%PORTDOCS%%share/doc/ja-jvim-%%VERSION%%/readme.doc
%%PORTDOCS%%share/doc/ja-jvim-%%VERSION%%/termcap.dos
%%PORTDOCS%%share/doc/ja-jvim-%%VERSION%%/tutor.j
%%PORTDOCS%%share/doc/ja-jvim-%%VERSION%%/uganda.jp
%%PORTDOCS%%share/doc/ja-jvim-%%VERSION%%/vim-jp.htm
%%PORTDOCS%%share/doc/ja-jvim-%%VERSION%%/vim32.ini
%%PORTDOCS%%@dirrm share/doc/ja-jvim-%%VERSION%%
@unexec if cmp -s %D/etc/jvim3rc %D/etc/jvim3rc.dist; then rm -f %D/etc/jvim3rc; fi
etc/jvim3rc.dist
@exec if [ ! -f %D/etc/jvim3rc ]; then cp %D/etc/jvim3rc.dist %D/etc/jvim3rc; fi