MacVim 20090620

diff --git a/PortIndex b/PortIndex
index 01db7e4..a55f291 100644 (file)
--- a/PortIndex
+++ b/PortIndex
@@ -7,10 +7,10 @@ portdir devel/fmdiff description {Wrapper scripts for FileMerge} platforms darwi
 gettext 741
 variants {universal darwin_6} variant_desc {universal {Build for multiple architectures} darwin_6 {Platform variant, do not select manually}} portdir devel/gettext description {GNU gettext package} homepage http://www.gnu.org/software/gettext/ epoch 0 platforms {darwin freebsd linux} depends_lib {port:libiconv port:ncurses port:expat} name gettext maintainers ryandesign long_description {This is the GNU gettext package. It is interesting for authors or maintainers of other packages or programs which they want to see internationalized. As one step the handling of messages in different languages should be implemented. For this task GNU gettext provides the needed tools and library functions.} version 0.17 categories devel revision 4
 macvim 824
-variants {perl python ruby tcl cscope standalone gdb universal} variant_desc {perl {Enable Perl scripting} python {Enable Python scripting} ruby {Enable Ruby scripting} tcl {Enable Tcl scripting} cscope {Enable source code browsing with cscope} standalone {Enable standalonize} gdb {Enable GDB integration} universal {Build for multiple architectures}} portdir editors/macvim description {MacVim is a port of the text editor Vim to Mac OS X.} homepage http://code.google.com/p/macvim-kaoriya/ epoch 0 platforms darwin name macvim depends_lib {port:cmigemo port:gettext port:libiconv port:ncurses} maintainers nomaintainer long_description {MacVim supports multiple windows with tabbed editing and a host of other features. MacVim brings you the full power of Vim to Mac OS X.} version 20090511 categories editors revision 0
+variants {perl python ruby tcl cscope standalone gdb universal} variant_desc {perl {Enable Perl scripting} python {Enable Python scripting} ruby {Enable Ruby scripting} tcl {Enable Tcl scripting} cscope {Enable source code browsing with cscope} standalone {Enable standalonize} gdb {Enable GDB integration} universal {Build for multiple architectures}} portdir editors/macvim description {MacVim is a port of the text editor Vim to Mac OS X.} homepage http://code.google.com/p/macvim-kaoriya/ epoch 0 platforms darwin name macvim depends_lib {port:cmigemo port:gettext port:libiconv port:ncurses} maintainers nomaintainer long_description {MacVim supports multiple windows with tabbed editing and a host of other features. MacVim brings you the full power of Vim to Mac OS X.} version 20090620 categories editors revision 0
 vim-app 901
 variants {xim perl python ruby tcl cscope darwin_ppc gdb aqua cocoa universal} depends_build {bin:gnutar:gnutar bin:grep:grep bin:7za:p7zip} variant_desc {xim {Build with support for X Input Method} perl {Enable Perl scripting} python {Enable Python scripting} ruby {Enable Ruby scripting} tcl {Enable Tcl scripting} cscope {Enable source code browsing with cscope} gdb {Enable GDB integration} universal {Build for multiple architectures}} portdir editors/vim-app description {Vim.app is a GUI version of the famous editor vim.} homepage http://www.vim.org/ epoch 0 platforms darwin name vim-app depends_lib {port:ncurses port:gettext port:libiconv port:ctags} maintainers nomaintainer long_description {This port provides Vim.app, a GUI version of the famous editor vim. Vim is a highly configurable text editor built to enable efficient text editing.} categories editors version 7.2.147 revision 2
-zsh-devel 1112
-variants {darwin_8 mp_completion pcre doc examples cjk universal} variant_desc {darwin_8 {Platform variant, do not select manually} mp_completion {Install port(1) completion file} pcre {Add regular expressions support in builtin functions through PCRE} doc {Install extra documentation} examples {Install configuration examples} cjk {Add East Asian Ambiguous characters support} universal {Build for multiple architectures}} portdir shells/zsh-devel description {Zsh is a UNIX command interpreter (shell)} homepage http://www.zsh.org/ epoch 0 platforms darwin name zsh-devel depends_lib {port:libiconv port:ncursesw} maintainers {nox openmaintainer} long_description {Zsh is a UNIX command interpreter (shell) which of the standard shells most resembles the Korn shell (ksh), although it is not completely compatible. It includes enhancements of many types, notably in the command-line editor, options for customising its behaviour, filename globbing, features to make C-shell (csh) users feel more at home and extra features drawn from tcsh (another `custom' shell).} version 4.3.9 categories shells revision 1
+zsh-devel 1123
+variants {darwin_8 mp_completion pcre doc examples cjk universal} variant_desc {darwin_8 {Platform variant, do not select manually} mp_completion {Install port(1) completion file} pcre {Add regular expressions support in builtin functions through PCRE} doc {Install extra documentation} examples {Install configuration examples} cjk {Add East Asian Ambiguous characters support} universal {Build for multiple architectures}} portdir shells/zsh-devel description {Zsh is a UNIX command interpreter (shell)} homepage http://www.zsh.org/ epoch 0 platforms darwin name zsh-devel depends_lib {port:libiconv port:ncursesw port:gdbm} maintainers {nox openmaintainer} long_description {Zsh is a UNIX command interpreter (shell) which of the standard shells most resembles the Korn shell (ksh), although it is not completely compatible. It includes enhancements of many types, notably in the command-line editor, options for customising its behaviour, filename globbing, features to make C-shell (csh) users feel more at home and extra features drawn from tcsh (another `custom' shell).} version 4.3.10 categories shells revision 0
 cmigemo 503
 variants {utf8 universal} variant_desc {universal {Build for multiple architectures}} portdir textproc/cmigemo description {C/Migemo is a Japanese incremental search tool.} homepage http://www.kaoriya.net/ epoch 0 name cmigemo depends_lib {bin:iconv:libiconv bin:nkf:nkf} maintainers nomaintainer long_description {C/Migemo is a set of a library and an application to search Japanese words incrementally, or a C version of Migemo originally written in Ruby.} version 1.3c categories textproc revision 8

diff --git a/Readme.txt b/Readme.txt
index 6ab9f04..fce2dbb 100644 (file)
--- a/Readme.txt
+++ b/Readme.txt
@@ -3,5 +3,5 @@
   fmdiff @7819_0 (active)
   gettext @0.17_4+universal (active)
   iTerm @0.9.6_20090614 (active)
-  macvim @20090511_0+cscope+gdb+perl+python+ruby+standalone+universal (active)
-  zsh-devel @4.3.9_1+cjk+mp_completion+pcre (active)
+  macvim @20090620_0+cscope+gdb+perl+python+ruby+standalone+universal (active)
+  zsh-devel @4.3.10_0+cjk+mp_completion+pcre (active)

diff --git a/editors/macvim/Portfile b/editors/macvim/Portfile
index dae29a9..c6a41ef 100644 (file)
--- a/editors/macvim/Portfile
+++ b/editors/macvim/Portfile
@@ -2,7 +2,7 @@
 PortSystem     1.0
 
 name                           macvim
-version                                20090511
+version                                20090620
 revision                       0
 categories                     editors
 platforms                      darwin
@@ -16,7 +16,7 @@ set gittag                    ${version}
 distname                       KaoriYa-${gittag}
 use_zip                                yes
 checksums                      \
-       ${distname}.zip sha1 ae9e8f8d289a4a5b063f5e36a12c337520a3b2ea
+       ${distname}.zip sha1 ff8e8cddb21ccdb51ea90e244be645fcc6d8278b
 master_sites           \
        "http://repo.or.cz/w/MacVim/KaoriYa.git?a=snapshot;h=${gittag};sf=zip&"
 worksrcdir                     KaoriYa/src

diff --git a/editors/macvim/files/patch-option.c b/editors/macvim/files/patch-option.c
index 07f6eee..2d9cd44 100644 (file)
--- a/editors/macvim/files/patch-option.c
+++ b/editors/macvim/files/patch-option.c
@@ -1,9 +1,33 @@
 --- option.c.orig
 +++ option.c
-@@ -1169,14 +1169,6 @@
-                           (char_u *)&p_fp, PV_NONE,
-                           {(char_u *)"", (char_u *)0L}},
-     {"fsync",       "fs",   P_BOOL|P_SECURE|P_VI_DEF,
+@@ -524,11 +524,6 @@
+                           (char_u *)NULL, PV_NONE,
+ #endif
+                           {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+-#ifdef FEAT_GDB
+-    {"asm",       NULL,   P_NUM|P_VI_DEF,
+-                          (char_u *)&p_asm, PV_NONE,
+-                          {(char_u *)10L, (char_u *)0L}},
+-#endif
+     {"altkeymap",   "akm",  P_BOOL|P_VI_DEF,
+ #ifdef FEAT_FKMAP
+                           (char_u *)&p_altkeymap, PV_NONE,
+@@ -545,6 +540,11 @@
+                           {(char_u *)0L, (char_u *)0L}
+ #endif
+                           SCRIPTID_INIT},
++#ifdef FEAT_GDB
++    {"asm",       NULL,   P_NUM|P_VI_DEF,
++                          (char_u *)&p_asm, PV_NONE,
++                          {(char_u *)10L, (char_u *)0L}},
++#endif
+ #ifdef FEAT_AUTOCHDIR
+     {"autochdir",  "acd",   P_BOOL|P_VI_DEF,
+                           (char_u *)&p_acd, PV_NONE,
+@@ -1158,14 +1158,6 @@
+ # endif
+                           SCRIPTID_INIT},
+ #endif
 -#ifdef FEAT_GDB
 -    {"gdbvariables", "gdbvar",P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
 -                          (char_u *)&p_gvar, PV_NONE,
@@ -12,13 +36,13 @@
 -                          (char_u *)&p_gdp, PV_NONE,
 -                          {(char_u *)"gdb", (char_u *)0L} },
 -#endif
- #ifdef HAVE_FSYNC
-                           (char_u *)&p_fs, PV_NONE,
-                           {(char_u *)TRUE, (char_u *)0L}
-@@ -1200,6 +1192,14 @@
-                           (char_u *)NULL, PV_NONE,
-                           {(char_u *)NULL, (char_u *)0L}},
+     {"formatexpr", "fex",   P_STRING|P_ALLOCED|P_VI_DEF|P_VIM,
+ #ifdef FEAT_EVAL
+                           (char_u *)&p_fex, PV_FEX,
+@@ -1211,6 +1203,14 @@
+                           {(char_u *)NULL, (char_u *)0L}
  #endif
+                           SCRIPTID_INIT},
 +#ifdef FEAT_GDB
 +    {"gdbvariables", "gdbvar",P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
 +                          (char_u *)&p_gvar, PV_NONE,
@@ -29,4 +53,4 @@
 +#endif
      {"gdefault",    "gd",   P_BOOL|P_VI_DEF|P_VIM,
                            (char_u *)&p_gd, PV_NONE,
-                           {(char_u *)FALSE, (char_u *)0L}},
+                           {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},