vim-app install kaoriya vim scripts and fix alpha

diff --git a/editors/vim-app/Portfile b/editors/vim-app/Portfile
index 15dfdf3..fb442d9 100644 (file)
--- a/editors/vim-app/Portfile
+++ b/editors/vim-app/Portfile
@@ -66,8 +66,7 @@ configure.args      --without-x \
                     --with-tlib=ncurses \
                     --enable-multibyte \
                     --with-features=huge
-configure.cppflags  -DSYS_VIMRC_FILE=\\"${prefix}/etc/vimrc\\" \
-                    -I${prefix}/include
+configure.cppflags  -I${prefix}/include
 configure.ldflags   -L${prefix}/lib
 
 extract.only        [suffix ${realname}-${vim_version}]
@@ -91,8 +90,6 @@ pre-destroot {
 destroot {
     # copy Vim.app
     file copy ${worksrcpath}/src/Vim.app ${destroot}${applications_dir}
-    xinstall -m 644 ${filespath}/vimrc ${filespath}/gvimrc \
-      ${destroot}${applications_dir}/Vim.app
     xinstall -m 644 ${workpath}/doc-txt.icns \
       ${destroot}${applications_dir}/Vim.app/Contents/Resources
     xinstall -m 644 ${workpath}/app.icns \
@@ -116,12 +113,6 @@ destroot {
 
 # general vim variants
 
-variant big description {Build big feature set} conflicts huge {
-    configure.args-append --with-features=big
-}
-variant huge description {Build huge feature set} conflicts big {
-    configure.args-append --with-features=huge
-}
 variant xim description {Build with support for X Input Method} {
     configure.args-append --with-xim
 }

diff --git a/editors/vim-app/files/gvimrc b/editors/vim-app/files/gvimrc
index 59bba44..2f75542 100644 (file)
--- a/editors/vim-app/files/gvimrc
+++ b/editors/vim-app/files/gvimrc
@@ -15,21 +15,21 @@ set cpo&vim
 
 " Define mac-standard menu items and keyboard shortcuts.
 
-aunmenu &File.&New
+"aunmenu &File.&New
 amenu 10.325 &File.&New<Tab><D-n> <D-n>
 nmap <D-n> :confirm enew<CR>
 vmap <D-n> <Esc><D-n>gv
 imap <D-n> <C-O><D-n>
 cmap <D-n> <C-C><D-n>
 omap <D-n> <Esc><D-n>
-aunmenu &File.&Open\.\.\.
+"aunmenu &File.&Open\.\.\.
 amenu 10.310 &File.&Open\.\.\.<Tab><D-o> <D-o>
 nmap <D-o> :browse confirm e<CR>
 vmap <D-o> <Esc><D-o>gv
 imap <D-o> <C-O><D-o>
 cmap <D-o> <C-C><D-o>
 omap <D-o> <Esc><D-o>
-aunmenu &File.&Close
+"aunmenu &File.&Close
 amenu 10.330 &File.&Close<Tab><D-w> <D-w>
 nmap <silent> <D-w> :if winheight(2) < 0 <Bar>
        \   confirm enew <Bar>
@@ -40,7 +40,7 @@ vmap <D-w> <Esc><D-w>gv
 imap <D-w> <C-O><D-w>
 cmap <D-w> <C-C><D-w>
 omap <D-w> <Esc><D-w>
-aunmenu &File.&Save
+"aunmenu &File.&Save
 amenu 10.340 &File.&Save<Tab><D-s> <D-s>
 nmap <silent> <D-s> :if expand("%") == ""<Bar>browse confirm w<Bar>
        \ else<Bar>confirm w<Bar>endif<CR>
@@ -48,7 +48,7 @@ vmap <D-s> <Esc><D-s>gv
 imap <D-s> <C-O><D-s>
 cmap <D-s> <C-C><D-s>
 omap <D-s> <Esc><D-s>
-aunmenu &File.Save\ &As\.\.\.
+"aunmenu &File.Save\ &As\.\.\.
 amenu 10.350 &File.Save\ &As\.\.\.<Tab><D-S>   <D-S-s>
 nmap <D-S-s> :browse confirm saveas<CR>
 vmap <D-S-s> <Esc><D-s>gv
@@ -64,7 +64,7 @@ omap <D-S-s> <Esc><D-s>
 "cmap <D-q> <C-C><D-q>
 "omap <D-q> <Esc><D-q>
 " From the Edit menu of SimpleText:
-aunmenu &Edit.&Undo
+"aunmenu &Edit.&Undo
 amenu 20.310 &Edit.&Undo<Tab><D-z> <D-z>
 nmap <D-z> u
 vmap <D-z> <Esc><D-z>gv
@@ -80,7 +80,7 @@ vmap <D-c> "+y
 cunmenu &Edit.&Copy
 cmenu 20.350 &Edit.&Copy<Tab><D-c> <D-c>
 cmap <D-c> <C-Y>
-aunmenu &Edit.&Paste
+"aunmenu &Edit.&Paste
 nmenu 20.360 &Edit.&Paste<Tab><D-v> <D-v>
 nmap <D-v> "+gP
 cmenu       &Edit.&Paste<Tab><D-v> <D-v>
@@ -94,7 +94,7 @@ else
   vmap <D-v> "-c<Esc>gix<Esc><SID>Paste"_x
   imap <D-v> x<Esc><SID>Paste"_s
 endif
-aunmenu &Edit.&Select\ All
+"aunmenu &Edit.&Select\ All
 amenu 20.400 &Edit.Select\ &All<Tab><D-a>      <D-a>
 nmap <silent> <D-a> :if &slm != ""<Bar>exe ":norm gggH<C-O>G"<Bar>
        \ else<Bar>exe ":norm ggVG"<Bar>endif<CR>
@@ -102,7 +102,7 @@ vmap <D-a> <Esc><D-a>
 imap <D-a> <Esc><D-a>
 cmap <D-a> <C-C><D-a>
 omap <D-a> <Esc><D-a>
-aunmenu &Edit.&Find
+"aunmenu &Edit.&Find
 amenu 20.410 &Edit.&Find<Tab><D-f>     <D-f>
 nmap <D-f> /
 vmap <D-f> <Esc><D-f>

diff --git a/editors/vim-app/files/kaoriya b/editors/vim-app/files/kaoriya
index 905cb80..4ca3a65 100644 (file)
--- a/editors/vim-app/files/kaoriya
+++ b/editors/vim-app/files/kaoriya
@@ -2,6 +2,7 @@
 # see http://2xup.org/log/2006/09/13-0220
 #     http://kimuraw.txt-nifty.com/d/2006/11/vim_portfile.html
 set kaoriya_patch   vim72-20090321-kaoriya-w32j.exe
+set kaoriya_path    ${worksrcpath}/vim72-kaoriya-w32j
 
 #depends_lib-append  lib:libmigemo:cmigemo
 master_sites-append http://www.kaoriya.net/dist/:kaoriya
@@ -11,10 +12,12 @@ depends_build-append bin:7za:p7zip
 post-patch {
     system "7za x ${distpath}/${kaoriya_patch}"
     if {[variant_isset cocoa]} {
-        file delete ${worksrcpath}/vim72-kaoriya-w32j/patches/0016-transparency_option.diff
+        file delete ${kaoriya_path}/patches/0016-transparency_option.diff
     }
-    system "cat vim72-kaoriya-w32j/patches/*| patch -p0"
+    system "cat ${kaoriya_path}/patches/*| patch -p0"
     system "cat ${portpath}/${filesdir}/patch-fileio.c| patch -p0"
+    system "cat ${portpath}/${filesdir}/vimrc >> ${kaoriya_path}/vimrc"
+    system "cat ${portpath}/${filesdir}/gvimrc >> ${kaoriya_path}/gvimrc"
 }
 
 pre-configure {
@@ -52,6 +55,29 @@ if {![variant_isset aqua] && ![variant_isset cocoa]} {default_variants +aqua}
 post-destroot {
     set runtimePath \
         "${destroot}${applications_dir}/Vim.app/Contents/Resources/vim/runtime"
+    xinstall -m 644 ${kaoriya_path}/vimrc ${kaoriya_path}/gvimrc \
+        ${destroot}${applications_dir}/Vim.app/Contents/Resources/vim
+    xinstall -d ${runtimePath}/lang/ja/LC_MESSAGES
+    set scripts { \
+        encode_japan.vim \
+        keymap/azik_cp932.vim \
+        keymap/japanese_cp932.vim \
+        keymap/tcode_cp932.vim \
+        keymap/tutcode_cp932.vim \
+        lang/ja/LC_MESSAGES/vim.mo \
+        plugin/autodate.vim \
+        plugin/cmdex.vim \
+        plugin/dicwin.vim \
+        plugin/format.vim \
+        plugin/hz_ja.vim \
+        plugin/scrnmode.vim \
+        plugin/verifyenc.vim \
+    }
+    system "gnutar -C ${kaoriya_path}/runtime/ -cf - ${scripts} | \
+        gnutar -C ${runtimePath} -xvf -"
+    foreach f ${scripts} {
+        file attributes ${runtimePath}/${f} -permissions 0644
+    }
     file copy ${prefix}/share/migemo/tools/migemo.vim \
         ${runtimePath}/plugin/migemo.vim
     reinplace "s|dict/migemo-dict|dict/\".\\&encoding.\"/migemo-dict|" \

diff --git a/editors/vim-app/files/patch-gui_mac.m b/editors/vim-app/files/patch-gui_mac.m
index 6f5bc09..47888e3 100644 (file)
--- a/editors/vim-app/files/patch-gui_mac.m
+++ b/editors/vim-app/files/patch-gui_mac.m
@@ -13,7 +13,7 @@
  #define FF_Y(row)               (gui_mac.main_height - FILL_Y(row))
  #define FT_Y(row)               (gui_mac.main_height - TEXT_Y(row))
 -#define VIM_BG_ALPHA            ((100 - p_transp) / 100.0)
-+#define VIM_BG_ALPHA            ((p_transp - 255) / 255.0)
++#define VIM_BG_ALPHA            (p_transp / 255.0)
  
  /* A simple view to make setting text area, scrollbar position inside 
   * vim window easier */