svn commit: r317231 - in head/japanese/jvim3: . files
Hiroki Sato
hrs at FreeBSD.org
Fri May 3 18:57:55 UTC 2013
Author: hrs
Date: Fri May 3 18:57:53 2013
New Revision: 317231
URL: http://svnweb.freebsd.org/changeset/ports/317231
Log:
- Update to 3.0.j2.1b.
- Use OPTIONS_RADIO for Japanese FEP selection.
- Fix build when CC is defined.
- Respect CFLAGS.
- Rename MACHINE and TARGET in Makefile.
- Mark MAKE_JOBS_SAFE=yes.
Added:
head/japanese/jvim3/files/patch-src-makjunix.mak
- copied, changed from r317226, head/japanese/jvim3/files/patch-aa
head/japanese/jvim3/files/patch-src-term.c
- copied unchanged from r317226, head/japanese/jvim3/files/patch-ab
Deleted:
head/japanese/jvim3/files/patch-aa
head/japanese/jvim3/files/patch-ab
Modified:
head/japanese/jvim3/Makefile
head/japanese/jvim3/distinfo
Modified: head/japanese/jvim3/Makefile
==============================================================================
--- head/japanese/jvim3/Makefile Fri May 3 18:20:43 2013 (r317230)
+++ head/japanese/jvim3/Makefile Fri May 3 18:57:53 2013 (r317231)
@@ -1,19 +1,14 @@
-# New ports collection makefile for: jvim3
-# Date created: 98/11/17
-# Whom: Satoshi TAOKA <taoka at FreeBSD.org>
-#
+# Created by: Satoshi TAOKA <taoka at FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= jvim
-PORTVERSION= 3.0.j2.1a
-PORTREVISION= 4
+PORTVERSION= 3.0.j2.1b
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 jvim.2.1a.tar.gz
+ http://hp.vector.co.jp/authors/VA003457/vim/vim3/2.1b/
+DISTFILES= vim-3.0.tar.gz jvim.2.1b.tar.gz
-MAINTAINER= ports at FreeBSD.org
+MAINTAINER= hrs at FreeBSD.org
COMMENT= Japanized Vim-3.0
EXTRA_PATCHES= ${WRKDIR}/${PORTNAME}.diff
@@ -26,14 +21,16 @@ PLIST_SUB= VERSION=${PORTVERSION}
MAKE_ARGS= FEPOPT='${FEPOPT}' \
FEPLIBS="${FEPLIBS}" \
FEPOBJS="${FEPOBJS}" \
- MACHINE="${MACHINE}" \
- CC="${CC}" \
LIBS="${LIBS}"
+MAKE_JOBS_SAFE= yes
MAN1= jvim3.1
-OPTIONS_DEFINE= X11 CANNA DIRECT_CANNA WNN6 WNN7 FREEWNN
-OPTIONS_DEFAULT= CANNA FREEWNN X11
+OPTIONS_DEFINE= X11
+OPTIONS_DEFAULT=X11 FREEWNN
+OPTIONS_RADIO= FEP
+OPTIONS_RADIO_FEP= CANNA DIRECT_CANNA WNN6 WNN7 FREEWNN
+FEP_DESC= Japanese FrontEnd Processor
CANNA_DESC= Canna support (via ONEW library)
DIRECT_CANNA_DESC= Canna support (direct)
FREEWNN_DESC= FreeWnn support (via ONEW library)
@@ -44,64 +41,66 @@ PORTDOCS= cygwin.txt differen.doc fepctr
termcap.dos uganda.jp vim-jp.htm vim32.ini tutor.j
# -DUSE_X11 is the cause of a problem treating Japanese
-MACHINE= -DBSD_UNIX -DUSE_LOCALE
+CPPFLAGS+= -DBSD_UNIX -DUSE_LOCALE
LIBS= -ltermlib -L${PREFIX}/lib
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MX11}
USE_XORG= x11
-MACHINE+= -DUSE_X11
-CC+= -I${LOCALBASE}/include
+CPPFLAGS+= -DUSE_X11 -I${LOCALBASE}/include
LIBS+= -L${LOCALBASE}/lib -lX11
.endif
+.if ${PORT_OPTIONS:MDIRECT_CANNA} || \
+ ${PORT_OPTIONS:MCANNA} || \
+ ${PORT_OPTIONS:MFREEWNN} || \
+ ${PORT_OPTIONS:MWNN6} || \
+ ${PORT_OPTIONS:MWNN7}
+FEPOPT+= -DJP_DEF=\"EEE\" -DFEPCTRL
+.endif
+
# Direct connection to Canna
.if ${PORT_OPTIONS:MDIRECT_CANNA}
-INPUT_METHOD+= direct_canna
LIB_DEPENDS+= canna.1:${PORTSDIR}/japanese/canna-lib
-FEPOPT+= -DJP_DEF=\"EEE\" -DCANNA -DFEPCTRL
-FEPLIBS= -lcanna
+FEPOPT+= -DCANNA
+FEPLIBS= -lcanna -L${LOCALBASE}/lib
FEPOBJS= fepcanna.o
JVIM3RC= "set fepctrl"
-.else
+.endif
+
+.if ${PORT_OPTIONS:MFREEWNN} || \
+ ${PORT_OPTIONS:MWNN6} || \
+ ${PORT_OPTIONS:MWNN7} || \
+ ${PORT_OPTIONS:MCANNA}
+FEPOPT+= -DONEW
+FEPOBJS= feponew.o
+JVIM3RC= "set fepctrl onewredraw"
+.endif
# Connection by using ONEW library
.if ${PORT_OPTIONS:MCANNA}
-INPUT_METHOD+= canna
LIB_DEPENDS+= canna.1:${PORTSDIR}/japanese/canna-lib
-FEPLIBS+= -L${LOCALBASE}/lib -lonew-canna -lcanna
-FEPOPT+= -DJP_DEF=\"EEE\" -DONEW -DFEPCTRL
-FEPOBJS= feponew.o
-JVIM3RC= "set fepctrl onewredraw"
+BUILD_DEPENDS+= ${LOCALBASE}/lib/libonew-canna.a:${PORTSDIR}/japanese/onew
+FEPLIBS+= -lonew-canna -lcanna
.endif
.if ${PORT_OPTIONS:MFREEWNN}
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"
+FEPLIBS+= -lonew-freewnn -ljd -lcrypt
.endif
.if ${PORT_OPTIONS:MWNN6}
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"
+FEPLIBS+= -lonew-wnn6 -ljd -lcrypt
.endif
.if ${PORT_OPTIONS:MWNN7}
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
+FEPLIBS+= -lonew-wnn7 -ljd -lcrypt
.endif
post-build:
Modified: head/japanese/jvim3/distinfo
==============================================================================
--- head/japanese/jvim3/distinfo Fri May 3 18:20:43 2013 (r317230)
+++ head/japanese/jvim3/distinfo Fri May 3 18:57:53 2013 (r317231)
@@ -1,4 +1,4 @@
SHA256 (vim-3.0.tar.gz) = cbeb6db48cad09c7ae3706fa9510669bee5b17d39033727e8453c4a9afce061f
SIZE (vim-3.0.tar.gz) = 468153
-SHA256 (jvim.2.1a.tar.gz) = 96bc2d9cf5b0a24aa5377af5829a9ff8cfb3176ea7170ec401d9f4af84e5993a
-SIZE (jvim.2.1a.tar.gz) = 668190
+SHA256 (jvim.2.1b.tar.gz) = ea8b63d0c7aa7516f1e28c58e22c92b9706b2052804c5c79e1f533b486faca60
+SIZE (jvim.2.1b.tar.gz) = 687277
Copied and modified: head/japanese/jvim3/files/patch-src-makjunix.mak (from r317226, head/japanese/jvim3/files/patch-aa)
==============================================================================
--- head/japanese/jvim3/files/patch-aa Fri May 3 17:42:12 2013 (r317226, copy source)
+++ head/japanese/jvim3/files/patch-src-makjunix.mak Fri May 3 18:57:53 2013 (r317231)
@@ -1,17 +1,6 @@
---- src/makjunix.mak.orig Sat Jun 30 18:14:16 2001
-+++ src/makjunix.mak Sat Jun 30 18:16:14 2001
-@@ -61,8 +61,8 @@
- #X11LIBDIR = /usr/lib/X11R5
- #X11INCDIR = /usr/include/X11R5
- ###
--#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 @@
+--- src/makjunix.mak.orig 2013-05-04 03:51:13.000000000 +0900
++++ src/makjunix.mak 2013-05-04 03:52:09.000000000 +0900
+@@ -72,16 +72,17 @@
### Prefix for location of files
@@ -23,11 +12,16 @@
### Name of target
-TARGET = vim
-+TARGET = jvim3
++PROG = jvim3
### Location of man page
- MANLOC = $(PREFIX)/man/man1
-@@ -100,7 +100,7 @@
+-MANLOC = $(PREFIX)/man/man1
++MAN1PREFIX?= ${PREFIX}
++MANLOC = $(MAN1PREFIX)/man/man1
+
+ ### Location of help file
+ HELPLOC = $(PREFIX)/lib
+@@ -100,7 +101,7 @@
MANFILE = ../doc/vim.1
@@ -36,7 +30,7 @@
#
# PART 2: various choices
-@@ -168,7 +168,8 @@
+@@ -168,7 +169,8 @@
DEFS = -DDIGRAPHS -DTERMCAP -DSOME_BUILTIN_TCAPS -DNO_FREE_NULL -DVIM_ISSPACE \
-DWEBB_COMPLETE -DWEBB_KEYWORD_COMPL \
@@ -46,28 +40,243 @@
-DKANJI -DUCODE -DTRACK -DCRMARK -DFEXRC -DUSE_GREP -DUSE_TAGEX -DUSE_OPT $(FEPOPT)
#
-@@ -460,11 +461,11 @@
- chmod $(BINMOD) $(BINLOC)/$(TARGET)
- $(STRIP) $(BINLOC)/$(TARGET)
- -mkdir $(MANLOC)
+@@ -424,7 +426,7 @@
+ ## no changes required below this line ##
+ ################################################
+
+-CFLAGS = -c $(MACHINE) $(DEFS)
++CFLAGS+= $(CPPFLAGS) $(DEFS)
+
+ INCL = vim.h globals.h param.h keymap.h macros.h ascii.h term.h unix.h structs.h proto.h
+
+@@ -438,36 +440,32 @@
+
+ GOBJ = grep.o alloc.o charset.o kanji.o regexp.o regsub.o u2s.o s2u.o
+
+-all: $(TARGET) grep
++all: $(PROG) grep
+
+-$(TARGET): $(OBJ) version.c
+- $(CC) $(CFLAGS) version.c
+- $(CC) -o $(TARGET) $(OBJ) version.o $(LIBS) $(FEPLIBS)
++$(PROG): $(OBJ) version.c
++ $(CC) -c $(CFLAGS) version.c
++ $(CC) -o $(PROG) $(OBJ) version.o $(LIBS) $(FEPLIBS)
+
+ grep: $(GOBJ)
+ $(CC) -o grep/grep $(GOBJ) $(LIBS) $(FEPLIBS)
+
+ debug: $(OBJ) version.c
+- $(CC) $(CFLAGS) version.c
+- $(CC) -o $(TARGET) -g $(OBJ) version.o $(LIBS)
++ $(CC) -c $(CFLAGS) version.c
++ $(CC) -o $(PROG) -g $(OBJ) version.o $(LIBS)
+
+ ctags:
+ ctags *.c *.h
+
+-install: $(TARGET)
+- -mkdir $(BINLOC)
+- cp $(TARGET) $(BINLOC)
+- chmod $(BINMOD) $(BINLOC)/$(TARGET)
+- $(STRIP) $(BINLOC)/$(TARGET)
+- -mkdir $(MANLOC)
- cp $(MANFILE) $(MANLOC)
- chmod $(MANMOD) $(MANLOC)/vim.1
-+ cp $(MANFILE) $(MANLOC)/jvim3.1
-+ chmod $(MANMOD) $(MANLOC)/jvim3.1
- -mkdir $(HELPLOC)
+- -mkdir $(HELPLOC)
- cp $(HELPFILE) $(HELPLOC)
- chmod $(HELPMOD) $(HELPLOC)/vim.hlp
-+ cp $(HELPFILE) $(HELPLOC)/jvim3.hlp
-+ chmod $(HELPMOD) $(HELPLOC)/jvim3.hlp
++install: $(PROG)
++ mkdir -p $(BINLOC)
++ ${BSD_INSTALL_PROGRAM} ${PROG} ${BINLOC}
++ mkdir -p $(MANLOC)
++ ${BSD_INSTALL_MAN} $(MANFILE) $(MANLOC)/jvim3.1
++ mkdir -p $(HELPLOC)
++ ${BSD_INSTALL_DATA} $(HELPFILE) $(HELPLOC)/jvim3.hlp
clean:
- -rm -f $(OBJ) mkcmdtab.o version.o core $(TARGET) mkcmdtab cmdtab.h
-@@ -619,7 +620,7 @@
- $(CC) $(CFLAGS) fepbow.c
+- -rm -f $(OBJ) mkcmdtab.o version.o core $(TARGET) mkcmdtab cmdtab.h
++ -rm -f $(OBJ) mkcmdtab.o version.o core $(PROG) mkcmdtab cmdtab.h
+ -rm -f *.bak
+ -rm -f $(GOBJ)
+ # -rm -f jptab.h jptab
+@@ -490,97 +488,97 @@
+ ###########################################################################
+
+ alloc.o: alloc.c $(INCL)
+- $(CC) $(CFLAGS) alloc.c
++ $(CC) -c $(CFLAGS) alloc.c
+
+ unix.o: unix.c $(INCL)
+- $(CC) $(CFLAGS) unix.c
++ $(CC) -c $(CFLAGS) unix.c
+
+ buffer.o: buffer.c $(INCL)
+- $(CC) $(CFLAGS) buffer.c
++ $(CC) -c $(CFLAGS) buffer.c
+
+ charset.o: charset.c $(INCL)
+- $(CC) $(CFLAGS) charset.c
++ $(CC) -c $(CFLAGS) charset.c
+
+ cmdcmds.o: cmdcmds.c $(INCL)
+- $(CC) $(CFLAGS) cmdcmds.c
++ $(CC) -c $(CFLAGS) cmdcmds.c
+
+ cmdline.o: cmdline.c $(INCL) cmdtab.h ops.h
+- $(CC) $(CFLAGS) cmdline.c
++ $(CC) -c $(CFLAGS) cmdline.c
+
+ csearch.o: csearch.c $(INCL)
+- $(CC) $(CFLAGS) csearch.c
++ $(CC) -c $(CFLAGS) csearch.c
+
+ digraph.o: digraph.c $(INCL)
+- $(CC) $(CFLAGS) digraph.c
++ $(CC) -c $(CFLAGS) digraph.c
+
+ edit.o: edit.c $(INCL) ops.h
+- $(CC) $(CFLAGS) edit.c
++ $(CC) -c $(CFLAGS) edit.c
+
+ fileio.o: fileio.c $(INCL)
+- $(CC) $(CFLAGS) fileio.c
++ $(CC) -c $(CFLAGS) fileio.c
+
+ getchar.o: getchar.c $(INCL)
+- $(CC) $(CFLAGS) getchar.c
++ $(CC) -c $(CFLAGS) getchar.c
+
+ help.o: help.c $(INCL)
+- $(CC) $(CFLAGS) help.c
++ $(CC) -c $(CFLAGS) help.c
+
+ linefunc.o: linefunc.c $(INCL)
+- $(CC) $(CFLAGS) linefunc.c
++ $(CC) -c $(CFLAGS) linefunc.c
+
+ main.o: main.c $(INCL)
+- $(CC) $(CFLAGS) main.c
++ $(CC) -c $(CFLAGS) main.c
+
+ mark.o: mark.c $(INCL)
+- $(CC) $(CFLAGS) mark.c
++ $(CC) -c $(CFLAGS) mark.c
+
+ memfile.o: memfile.c $(INCL)
+- $(CC) $(CFLAGS) memfile.c
++ $(CC) -c $(CFLAGS) memfile.c
+
+ memline.o: memline.c $(INCL)
+- $(CC) $(CFLAGS) memline.c
++ $(CC) -c $(CFLAGS) memline.c
+
+ message.o: message.c $(INCL)
+- $(CC) $(CFLAGS) message.c
++ $(CC) -c $(CFLAGS) message.c
+
+ misccmds.o: misccmds.c $(INCL)
+- $(CC) $(CFLAGS) misccmds.c
++ $(CC) -c $(CFLAGS) misccmds.c
+
+ normal.o: normal.c $(INCL) ops.h
+- $(CC) $(CFLAGS) normal.c
++ $(CC) -c $(CFLAGS) normal.c
+
+ ops.o: ops.c $(INCL) ops.h
+- $(CC) $(CFLAGS) ops.c
++ $(CC) -c $(CFLAGS) ops.c
+
+ param.o: param.c $(INCL)
+- $(CC) $(CFLAGS) param.c
++ $(CC) -c $(CFLAGS) param.c
+
+ quickfix.o: quickfix.c $(INCL)
+- $(CC) $(CFLAGS) quickfix.c
++ $(CC) -c $(CFLAGS) quickfix.c
+
+ regexp.o: regexp.c $(INCL)
+- $(CC) $(CFLAGS) regexp.c
++ $(CC) -c $(CFLAGS) regexp.c
+
+ regsub.o: regsub.c $(INCL)
+- $(CC) $(CFLAGS) regsub.c
++ $(CC) -c $(CFLAGS) regsub.c
+
+ screen.o: screen.c $(INCL)
+- $(CC) $(CFLAGS) screen.c
++ $(CC) -c $(CFLAGS) screen.c
+
+ search.o: search.c $(INCL) ops.h
+- $(CC) $(CFLAGS) search.c
++ $(CC) -c $(CFLAGS) search.c
+
+ tag.o: tag.c $(INCL)
+- $(CC) $(CFLAGS) tag.c
++ $(CC) -c $(CFLAGS) tag.c
+
+ term.o: term.c $(INCL)
+- $(CC) $(CFLAGS) term.c
++ $(CC) -c $(CFLAGS) term.c
+
+ undo.o: undo.c $(INCL)
+- $(CC) $(CFLAGS) undo.c
++ $(CC) -c $(CFLAGS) undo.c
+
+ window.o: window.c $(INCL)
+- $(CC) $(CFLAGS) window.c
++ $(CC) -c $(CFLAGS) window.c
+
+ cmdtab.h: cmdtab.tab mkcmdtab
+ ./mkcmdtab cmdtab.tab cmdtab.h
+@@ -589,19 +587,19 @@
+ $(CC) -o mkcmdtab mkcmdtab.o
+
+ mkcmdtab.o: mkcmdtab.c
+- $(CC) $(CFLAGS) mkcmdtab.c
++ $(CC) -c $(CFLAGS) mkcmdtab.c
+
+ kanji.o: kanji.c $(INCL) jptab.h
+- $(CC) $(CFLAGS) kanji.c
++ $(CC) -c $(CFLAGS) kanji.c
+
+ s2u.o: s2u.c
+- $(CC) $(CFLAGS) s2u.c
++ $(CC) -c $(CFLAGS) s2u.c
+
+ u2s.o: u2s.c
+- $(CC) $(CFLAGS) u2s.c
++ $(CC) -c $(CFLAGS) u2s.c
+
+ track.o: track.c $(INCL) jptab.h
+- $(CC) $(CFLAGS) track.c
++ $(CC) -c $(CFLAGS) track.c
+
+ #jptab.h: jptab
+ # ./jptab > jptab.h
+@@ -610,19 +608,19 @@
+ $(CC) -o jptab jptab.o
+
+ jptab.o: jptab.c
+- $(CC) $(CFLAGS) jptab.c
++ $(CC) -c $(CFLAGS) jptab.c
+
+ fepseq.o: fepseq.c
+- $(CC) $(CFLAGS) fepseq.c
++ $(CC) -c $(CFLAGS) fepseq.c
+
+ fepbow.o: fepbow.c
+- $(CC) $(CFLAGS) fepbow.c
++ $(CC) -c $(CFLAGS) fepbow.c
fepcanna.o: fepcanna.c
- $(CC) $(CFLAGS) -I/usr/local/canna/include fepcanna.c
-+ $(CC) $(CFLAGS) -I${PREFIX}/include fepcanna.c
++ $(CC) -c $(CFLAGS) -I${PREFIX}/include fepcanna.c
feponew.o: feponew.c
- $(CC) $(CFLAGS) feponew.c
+- $(CC) $(CFLAGS) feponew.c
++ $(CC) -c $(CFLAGS) feponew.c
+
+ grep.o: grep/grep.c
+- $(CC) $(CFLAGS) -I. grep/grep.c
++ $(CC) -c $(CFLAGS) -I. grep/grep.c
Copied: head/japanese/jvim3/files/patch-src-term.c (from r317226, head/japanese/jvim3/files/patch-ab)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/japanese/jvim3/files/patch-src-term.c Fri May 3 18:57:53 2013 (r317231, copy of r317226, head/japanese/jvim3/files/patch-ab)
@@ -0,0 +1,12 @@
+--- src/term.c.~1~ Thu Sep 17 11:58:38 1998
++++ src/term.c Fri Sep 18 09:26:33 1998
+@@ -207,7 +207,9 @@
+ T_CDL = TGETSTR("DL", &tp);
+ T_CS = TGETSTR("cs", &tp);
+ T_ED = TGETSTR("cl", &tp);
++#ifndef __FreeBSD__ /* by Satoshi TAOKA */
+ T_CI = TGETSTR("vi", &tp);
++#endif
+ T_CV = TGETSTR("ve", &tp);
+ T_CVV = TGETSTR("vs", &tp);
+ T_TP = TGETSTR("me", &tp);
More information about the svn-ports-head
mailing list