Date: Wed, 18 Nov 1998 17:22:28 -0800 (PST) From: taoka@infonets.hiroshima-u.ac.jp To: freebsd-gnats-submit@FreeBSD.ORG Subject: ports/8755: update: japanese/jvim3* Message-ID: <199811190122.RAA17418@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 8755 >Category: ports >Synopsis: update: japanese/jvim3* >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Wed Nov 18 17:30:01 PST 1998 >Last-Modified: >Originator: Satoshi Taoka >Organization: Hiroshima Univ. in Japan >Release: FreeBSD 3.0-RELEASE >Environment: >Description: updating ports of jvim3 by MAINTAINER Please run the following: cd /usr/ports patch -p0 < thie_patch and detete the following files: japanese/jvim3/patches/patch-ac japanese/jvim3/patches/patch-ad japanese/jvim3-canna+wnn6/pkg/PLIST japanese/jvim3-wnn6/pkg/PLIST By the way, these ports are marked NO_LATEST_LINK= YES # waiting for jgrep, jfold, jcat but, by this updating, jgrep is installed. Thank you. >How-To-Repeat: >Fix: diff -aruN ../org/japanese/jvim3/Makefile ./japanese/jvim3/Makefile --- ../org/japanese/jvim3/Makefile Sun Nov 1 08:31:25 1998 +++ ./japanese/jvim3/Makefile Thu Nov 19 10:04:54 1998 @@ -1,18 +1,17 @@ # New ports collection makefile for: jvim3 -# Version required: 3.0-j1.3d -# Date created: 97/10/30 +# Version required: 3.0-j1.3i +# Date created: 98/11/17 # Whom: Satoshi TAOKA <taoka@infonets.hiroshima-u.ac.jp> # # $Id: Makefile,v 1.5 1998/10/31 07:06:01 kuriyama Exp $ # DISTNAME= vim -PKGNAME?= ja-jvim-3.0.1.3d +PKGNAME?= ja-jvim-3.0.1.3i CATEGORIES= japanese editors MASTER_SITES= ftp://dutepp0.et.tudelft.nl/pub/Unix/Editors/ \ - http://www.freebsd.org/~kuriyama/distfiles/ \ - http://spock.vector.co.jp/authors/VA003457/vim/vim3/1.3d/ -DISTFILES= vim-3.0.tar.gz jvim.1.3d.tar.gz + http://hp.vector.co.jp/authors/VA003457/vim/vim3/1.3i/ +DISTFILES= vim-3.0.tar.gz ${JPATCH} MAINTAINER= taoka@infonets.hiroshima-u.ac.jp @@ -22,15 +21,13 @@ NO_LATEST_LINK= YES # waiting for jgrep, jfold, jcat PATCHDIR= ${.CURDIR}/../jvim3/patches FILESDIR= ${.CURDIR}/../jvim3/files -.if !defined(WNN6) -## For Wnn6 we use a local PLIST PLIST= ${.CURDIR}/../jvim3/pkg/PLIST -.endif EXTRACT_ONLY= vim-3.0.tar.gz MAKEFILE= makjunix.mak MAN1= jvim3.1 -VERSION= 3.0.1.3d +VERSION= 3.0.1.3i +JPATCH= jvim.1.3i.tar.gz PLIST_SUB= VERSION=${VERSION} PORT_DOCDIR= ${PREFIX}/share/doc/ja-jvim-${VERSION} # -DUSE_X11 is the cause of a problem treating Japanese @@ -92,7 +89,7 @@ .endif post-extract: - ${EXTRACT_CMD} -C ${WRKSRC} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/jvim.1.3d.tar.gz + ${EXTRACT_CMD} -C ${WRKSRC} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${JPATCH} pre-patch: cd ${WRKSRC}; ${PATCH} ${PATCH_DIST_ARGS} < ${WRKSRC}/jvim.diff @@ -108,11 +105,12 @@ if [ -e ${PREFIX}/etc/jvim3rc ]; then \ ${MV} ${PREFIX}/etc/jvim3rc ${PREFIX}/etc/jvim3rc.bak; \ fi - ${ECHO} "set fepctrl" > ${PREFIX}/etc/jvim3rc + ${INSTALL_PROGRAM} ${WRKSRC}/src/grep/grep ${PREFIX}/bin/jgrep + ${ECHO} "set fepctrl onewredraw" > ${PREFIX}/etc/jvim3rc .if !defined(NOPORTDOCS) .if defined(PORT_DOCDIR) ${MKDIR} ${PORT_DOCDIR} - for file in differen.doc readme.doc uganda.jp \ + for file in fj.txt differen.doc readme.doc uganda.jp \ fepctrl.doc tutor/tutor.j; do \ ${INSTALL_DATA} ${WRKSRC}/doc.j/$$file ${PORT_DOCDIR}; \ done diff -aruN ../org/japanese/jvim3/files/md5 ./japanese/jvim3/files/md5 --- ../org/japanese/jvim3/files/md5 Wed Oct 21 00:52:55 1998 +++ ./japanese/jvim3/files/md5 Tue Nov 17 17:18:15 1998 @@ -1,2 +1,2 @@ MD5 (vim-3.0.tar.gz) = ecc99d34ca57bc2d2e3b7e3d9832591d -MD5 (jvim.1.3d.tar.gz) = 5e1a3026ffbed99813da0a2768008747 +MD5 (jvim.1.3i.tar.gz) = 64680a1b536f0d393b676b7fd66c0076 diff -aruN ../org/japanese/jvim3/patches/patch-aa ./japanese/jvim3/patches/patch-aa --- ../org/japanese/jvim3/patches/patch-aa Wed Oct 21 00:52:55 1998 +++ ./japanese/jvim3/patches/patch-aa Tue Nov 17 21:08:14 1998 @@ -1,6 +1,6 @@ ---- src/makjunix.mak.orig Fri Sep 11 11:00:13 1998 -+++ src/makjunix.mak Tue Sep 15 16:26:30 1998 -@@ -55,20 +55,24 @@ +--- src/makjunix.mak.orig Tue Nov 17 20:55:43 1998 ++++ src/makjunix.mak Tue Nov 17 21:07:34 1998 +@@ -55,14 +55,14 @@ ### root directory for X11 files (unless overruled in hardware-dependend part) ### Unfortunately there is no standard for these, everybody puts them ### somewhere else @@ -11,11 +11,17 @@ ### for some hpux systems: #X11LIBDIR = /usr/lib/X11R5 #X11INCDIR = /usr/include/X11R5 - -+### for FreeBSD with XFree86 + ### +-#X11LIBDIR = /usr/X11R6/lib +-#X11INCDIR = /usr/X11R6/include +X11LIBDIR = /usr/X11R6/lib +X11INCDIR = /usr/X11R6/include -+ + ### + #X11LIBDIR = /usr/X386/lib + #X11INCDIR = /usr/X386/include +@@ -72,13 +72,13 @@ + + ### Prefix for location of files -PREFIX = /usr/local +PREFIX?= /usr/local @@ -29,7 +35,7 @@ ### Location of man page MANLOC = $(PREFIX)/man/man1 -@@ -90,7 +94,7 @@ +@@ -100,7 +100,7 @@ MANFILE = ../doc/vim.1 @@ -38,7 +44,7 @@ # # PART 2: various choices -@@ -158,7 +162,8 @@ +@@ -168,7 +168,8 @@ DEFS = -DDIGRAPHS -DTERMCAP -DSOME_BUILTIN_TCAPS -DNO_FREE_NULL -DVIM_ISSPACE \ -DWEBB_COMPLETE -DWEBB_KEYWORD_COMPL \ @@ -48,7 +54,7 @@ -DKANJI -DTRACK -DCRMARK -DFEXRC -DUSE_GREP -DUSE_OPT $(FEPOPT) # -@@ -430,11 +435,11 @@ +@@ -447,11 +448,11 @@ chmod $(BINMOD) $(BINLOC)/$(TARGET) $(STRIP) $(BINLOC)/$(TARGET) -mkdir $(MANLOC) @@ -64,12 +70,12 @@ clean: -rm -f $(OBJ) mkcmdtab.o version.o core $(TARGET) mkcmdtab cmdtab.h -@@ -582,7 +587,7 @@ +@@ -599,7 +600,7 @@ $(CC) $(CFLAGS) fepbow.c fepcanna.o: fepcanna.c - $(CC) $(CFLAGS) -I/usr/local/canna/include fepcanna.c -+ $(CC) $(CFLAGS) -I/usr/local/canna/include -I${PREFIX}/include fepcanna.c ++ $(CC) $(CFLAGS) -I${PREFIX}/include fepcanna.c feponew.o: feponew.c $(CC) $(CFLAGS) feponew.c diff -aruN ../org/japanese/jvim3/patches/patch-ac ./japanese/jvim3/patches/patch-ac --- ../org/japanese/jvim3/patches/patch-ac Wed Oct 21 00:52:55 1998 +++ ./japanese/jvim3/patches/patch-ac Thu Jan 1 09:00:00 1970 @@ -1,11 +0,0 @@ ---- src/vim.h.~1~ Thu Sep 24 17:10:48 1998 -+++ src/vim.h Thu Sep 24 17:22:54 1998 -@@ -137,7 +137,7 @@ - # undef M_XENIX - # include <sys/ndir.h> /* for MAXNAMLEN */ - # else --# if defined(SOLARIS) || defined(AIX) || defined(ARCHIE) -+# if defined(SOLARIS) || defined(AIX) || defined(ARCHIE) || __FreeBSD__ >= 3 - # include <dirent.h> /* for MAXNAMLEN */ - # else - # include <sys/dir.h> /* for MAXNAMLEN */ diff -aruN ../org/japanese/jvim3/patches/patch-ad ./japanese/jvim3/patches/patch-ad --- ../org/japanese/jvim3/patches/patch-ad Wed Oct 21 00:52:55 1998 +++ ./japanese/jvim3/patches/patch-ad Thu Jan 1 09:00:00 1970 @@ -1,15 +0,0 @@ ---- src/feponew.c.bak Wed Sep 30 04:37:03 1998 -+++ src/feponew.c Wed Sep 30 05:33:00 1998 -@@ -676,8 +676,10 @@ - case CR: - if (inbuf[0] != NUL) - Onew_kakutei(ch); -- else if (kakutei_char != ch) -+ else if (kakutei_char != ch){ - outbuf[otail++] = ch; -+ onew_clrmsg(); -+ } - outbuf[otail] = NUL; - break; - case 0x80: - diff -aruN ../org/japanese/jvim3/pkg/PLIST ./japanese/jvim3/pkg/PLIST --- ../org/japanese/jvim3/pkg/PLIST Wed Oct 21 00:52:55 1998 +++ ./japanese/jvim3/pkg/PLIST Tue Nov 17 21:54:01 1998 @@ -1,7 +1,9 @@ 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 +share/doc/ja-jvim-%%VERSION%%/fj.txt share/doc/ja-jvim-%%VERSION%%/tutor.j share/doc/ja-jvim-%%VERSION%%/differen.doc share/doc/ja-jvim-%%VERSION%%/readme.doc diff -aruN ../org/japanese/jvim3-canna/Makefile ./japanese/jvim3-canna/Makefile --- ../org/japanese/jvim3-canna/Makefile Wed Oct 21 00:52:55 1998 +++ ./japanese/jvim3-canna/Makefile Tue Nov 17 21:45:51 1998 @@ -1,12 +1,12 @@ # New ports collection makefile for: jvim3 for Canna -# Version required: 3.0-j1.3d -# Date created: 97/10/30 +# Version required: 3.0-j1.3i +# Date created: 98/11/17 # Whom: Satoshi TAOKA <taoka@infonets.hiroshima-u.ac.jp> # # $Id: Makefile,v 1.1.1.1 1998/10/20 15:52:55 kuriyama Exp $ # -PKGNAME= ja-jvim-canna-3.0.1.3d +PKGNAME= ja-jvim-canna-3.0.1.3i CANNA= yes diff -aruN ../org/japanese/jvim3-canna+wnn4/Makefile ./japanese/jvim3-canna+wnn4/Makefile --- ../org/japanese/jvim3-canna+wnn4/Makefile Wed Oct 21 00:52:55 1998 +++ ./japanese/jvim3-canna+wnn4/Makefile Tue Nov 17 21:46:15 1998 @@ -1,12 +1,12 @@ # New ports collection makefile for: jvim3 for Canna and Wnn4 -# Version required: 3.0-j1.3d -# Date created: 97/10/30 +# Version required: 3.0-j1.3i +# Date created: 98/11/17 # Whom: Satoshi TAOKA <taoka@infonets.hiroshima-u.ac.jp> # # $Id: Makefile,v 1.1.1.1 1998/10/20 15:52:55 kuriyama Exp $ # -PKGNAME= ja-jvim-canna+wnn4-3.0.1.3d +PKGNAME= ja-jvim-canna+wnn4-3.0.1.3i CANNA= yes WNN4= yes diff -aruN ../org/japanese/jvim3-canna+wnn6/Makefile ./japanese/jvim3-canna+wnn6/Makefile --- ../org/japanese/jvim3-canna+wnn6/Makefile Wed Oct 21 00:52:55 1998 +++ ./japanese/jvim3-canna+wnn6/Makefile Tue Nov 17 21:46:51 1998 @@ -1,12 +1,12 @@ # New ports collection makefile for: jvim3 for Canna and Wnn6 -# Version required: 3.0-j1.3d -# Date created: 97/10/30 +# Version required: 3.0-j1.3i +# Date created: 98/11/17 # Whom: Satoshi TAOKA <taoka@infonets.hiroshima-u.ac.jp> # # $Id: Makefile,v 1.1.1.1 1998/10/20 15:52:55 kuriyama Exp $ # -PKGNAME= ja-jvim-canna+wnn6-3.0.1.3d +PKGNAME= ja-jvim-canna+wnn6-3.0.1.3i CANNA= yes WNN6= yes diff -aruN ../org/japanese/jvim3-canna+wnn6/pkg/PLIST ./japanese/jvim3-canna+wnn6/pkg/PLIST --- ../org/japanese/jvim3-canna+wnn6/pkg/PLIST Wed Oct 21 00:52:55 1998 +++ ./japanese/jvim3-canna+wnn6/pkg/PLIST Thu Jan 1 09:00:00 1970 @@ -1,27 +0,0 @@ -bin/jvim3 -lib/jvim3.hlp -@exec ([ -f %D/etc/jvim3rc ] && mv %D/etc/jvim3rc %D/etc/jvim3rc.bak) || /usr/bin/true -etc/jvim3rc -share/doc/ja-jvim-%%VERSION%%/tutor.j -share/doc/ja-jvim-%%VERSION%%/differen.doc -share/doc/ja-jvim-%%VERSION%%/readme.doc -share/doc/ja-jvim-%%VERSION%%/uganda.jp -share/doc/ja-jvim-%%VERSION%%/fepctrl.doc -@dirrm share/doc/ja-jvim-%%VERSION%% -lib/wnn/ja_JP/rk.wnn6/1B_TOUPPER -lib/wnn/ja_JP/rk.wnn6/1B_ZENHIRA -lib/wnn/ja_JP/rk.wnn6/1B_ZENKATA -lib/wnn/ja_JP/rk.wnn6/1B_newTOUPPER -lib/wnn/ja_JP/rk.wnn6/2A_CTRL -lib/wnn/ja_JP/rk.wnn6/2B_DAKUTEN -lib/wnn/ja_JP/rk.wnn6/2B_JIS -lib/wnn/ja_JP/rk.wnn6/2B_ROMKANA -lib/wnn/ja_JP/rk.wnn6/2_TCODE -lib/wnn/ja_JP/rk.wnn6/3B_HANKATA -lib/wnn/ja_JP/rk.wnn6/3B_KATAKANA -lib/wnn/ja_JP/rk.wnn6/3B_ZENKAKU -lib/wnn/ja_JP/rk.wnn6/autork -lib/wnn/ja_JP/rk.wnn6/mode -lib/wnn/ja_JP/rk.wnn6/mode.hankata -lib/wnn/ja_JP/rk.wnn6/mode.nohankata -@dirrm lib/wnn/ja_JP/rk.wnn6 diff -aruN ../org/japanese/jvim3-direct_canna/Makefile ./japanese/jvim3-direct_canna/Makefile --- ../org/japanese/jvim3-direct_canna/Makefile Wed Oct 21 00:52:55 1998 +++ ./japanese/jvim3-direct_canna/Makefile Tue Nov 17 21:47:05 1998 @@ -1,12 +1,12 @@ # New ports collection makefile for: jvim3 for Canna without ONEW library -# Version required: 3.0-j1.3d -# Date created: 97/10/30 +# Version required: 3.0-j1.3i +# Date created: 98/11/17 # Whom: Satoshi TAOKA <taoka@infonets.hiroshima-u.ac.jp> # # $Id: Makefile,v 1.1.1.1 1998/10/20 15:52:55 kuriyama Exp $ # -PKGNAME= ja-jvim--direct_canna-3.0.1.3d +PKGNAME= ja-jvim--direct_canna-3.0.1.3i DIRECT_CANNA= yes diff -aruN ../org/japanese/jvim3-wnn4/Makefile ./japanese/jvim3-wnn4/Makefile --- ../org/japanese/jvim3-wnn4/Makefile Wed Oct 21 00:52:55 1998 +++ ./japanese/jvim3-wnn4/Makefile Tue Nov 17 21:47:19 1998 @@ -1,12 +1,12 @@ # New ports collection makefile for: jvim3 for Wnn4 -# Version required: 3.0-j1.3d -# Date created: 97/10/30 +# Version required: 3.0-j1.3i +# Date created: 98/11/17 # Whom: Satoshi TAOKA <taoka@infonets.hiroshima-u.ac.jp> # # $Id: Makefile,v 1.1.1.1 1998/10/20 15:52:55 kuriyama Exp $ # -PKGNAME= ja-jvim-wnn4-3.0.1.3d +PKGNAME= ja-jvim-wnn4-3.0.1.3i WNN4= yes diff -aruN ../org/japanese/jvim3-wnn6/Makefile ./japanese/jvim3-wnn6/Makefile --- ../org/japanese/jvim3-wnn6/Makefile Wed Oct 21 00:52:55 1998 +++ ./japanese/jvim3-wnn6/Makefile Tue Nov 17 21:47:33 1998 @@ -1,12 +1,12 @@ # New ports collection makefile for: jvim3 for Wnn6 -# Version required: 3.0-j1.3d -# Date created: 97/10/30 +# Version required: 3.0-j1.3i +# Date created: 98/11/17 # Whom: Satoshi TAOKA <taoka@infonets.hiroshima-u.ac.jp> # # $Id: Makefile,v 1.1.1.1 1998/10/20 15:52:55 kuriyama Exp $ # -PKGNAME= ja-jvim-wnn6-3.0.1.3d +PKGNAME= ja-jvim-wnn6-3.0.1.3i WNN6= yes diff -aruN ../org/japanese/jvim3-wnn6/pkg/PLIST ./japanese/jvim3-wnn6/pkg/PLIST --- ../org/japanese/jvim3-wnn6/pkg/PLIST Wed Oct 21 00:52:55 1998 +++ ./japanese/jvim3-wnn6/pkg/PLIST Thu Jan 1 09:00:00 1970 @@ -1,27 +0,0 @@ -bin/jvim3 -lib/jvim3.hlp -@exec ([ -f %D/etc/jvim3rc ] && mv %D/etc/jvim3rc %D/etc/jvim3rc.bak) || /usr/bin/true -etc/jvim3rc -share/doc/ja-jvim-%%VERSION%%/tutor.j -share/doc/ja-jvim-%%VERSION%%/differen.doc -share/doc/ja-jvim-%%VERSION%%/readme.doc -share/doc/ja-jvim-%%VERSION%%/uganda.jp -share/doc/ja-jvim-%%VERSION%%/fepctrl.doc -@dirrm share/doc/ja-jvim-%%VERSION%% -lib/wnn/ja_JP/rk.wnn6/1B_TOUPPER -lib/wnn/ja_JP/rk.wnn6/1B_ZENHIRA -lib/wnn/ja_JP/rk.wnn6/1B_ZENKATA -lib/wnn/ja_JP/rk.wnn6/1B_newTOUPPER -lib/wnn/ja_JP/rk.wnn6/2A_CTRL -lib/wnn/ja_JP/rk.wnn6/2B_DAKUTEN -lib/wnn/ja_JP/rk.wnn6/2B_JIS -lib/wnn/ja_JP/rk.wnn6/2B_ROMKANA -lib/wnn/ja_JP/rk.wnn6/2_TCODE -lib/wnn/ja_JP/rk.wnn6/3B_HANKATA -lib/wnn/ja_JP/rk.wnn6/3B_KATAKANA -lib/wnn/ja_JP/rk.wnn6/3B_ZENKAKU -lib/wnn/ja_JP/rk.wnn6/autork -lib/wnn/ja_JP/rk.wnn6/mode -lib/wnn/ja_JP/rk.wnn6/mode.hankata -lib/wnn/ja_JP/rk.wnn6/mode.nohankata -@dirrm lib/wnn/ja_JP/rk.wnn6 >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199811190122.RAA17418>