macvim: enable netbeans, add vimproc, remove +gdb

diff --git a/editors/macvim/Portfile b/editors/macvim/Portfile
index c6a41ef..4dc5fca 100644 (file)
--- a/editors/macvim/Portfile
+++ b/editors/macvim/Portfile
@@ -2,7 +2,7 @@
 PortSystem     1.0
 
 name                           macvim
-version                                20090620
+version                                20090710
 revision                       0
 categories                     editors
 platforms                      darwin
@@ -12,11 +12,12 @@ long_description    MacVim supports multiple windows with tabbed editing and a host
                                        MacVim brings you the full power of Vim to Mac OS X.
 homepage                       http://code.google.com/p/macvim-kaoriya/
 
-set gittag                     ${version}
+#set gittag                    ${version}
+set gittag                     ba738f99cdb041b8036d3a5347f423ebe0ab8049
 distname                       KaoriYa-${gittag}
 use_zip                                yes
 checksums                      \
-       ${distname}.zip sha1 ff8e8cddb21ccdb51ea90e244be645fcc6d8278b
+       ${distname}.zip sha1 9e5051886dff986083fe383127d2b925eb06c0c5
 master_sites           \
        "http://repo.or.cz/w/MacVim/KaoriYa.git?a=snapshot;h=${gittag};sf=zip&"
 worksrcdir                     KaoriYa/src
@@ -25,7 +26,8 @@ extract.only          ${distname}.zip
 depends_lib                    port:cmigemo \
                                        port:gettext \
                                        port:libiconv \
-                                       port:ncurses
+                                       port:ncurses \
+                                       port:vimproc
 
 configure.pre_args     --prefix=${applications_dir}
 configure.args         --enable-gui=macvim \
@@ -33,6 +35,7 @@ configure.args                --enable-gui=macvim \
                                        --disable-gpm \
                                        --with-features=huge \
                                        --enable-multibyte \
+                                       --enable-netbeans \
                                        --with-tlib=ncurses
 configure.cppflags     -I${prefix}/include
 configure.ldflags      -L${prefix}/lib
@@ -108,6 +111,7 @@ variant standalone description {Enable standalonize} {
                reinplace "s|^RUBY_LIBS|#RUBY_LIBS|" ${worksrcpath}/auto/config.mk
        }
        post-destroot {
+               # dylibs
                foreach dylib {intl.8 iconv.2 migemo.1 ncurses.5} {
                        set libname [lindex [split ${dylib} .] 0]
                        set instname "@executable_path/../Frameworks/lib${libname}.dylib"
@@ -128,6 +132,7 @@ variant standalone description {Enable standalonize} {
                        @executable_path/../Frameworks/libiconv.dylib \
                        ${appPath}/Frameworks/libintl.dylib"
 
+               # migemo dicts
                xinstall -d 755 ${runtimePath}/dict
                foreach mdict {han2zen.dat hira2kata.dat \
                                migemo-dict roma2hira.dat zen2han.dat} {
@@ -135,8 +140,12 @@ variant standalone description {Enable standalonize} {
                                ${runtimePath}/dict
                }
 
+               # ctags
                xinstall -m 755 ${prefix}/bin/ctags ${appPath}/MacOS/ctags
+
+               # vimproc
+               set vimprocPath ${prefix}/share/vimproc/autoload
+               xinstall -m 755 ${vimprocPath}/proc.so ${runtimePath}/autoload
+               xinstall -m 644 ${vimprocPath}/proc.vim ${runtimePath}/autoload
        }
 }
-
-include gdb

diff --git a/editors/macvim/files/gdb b/editors/macvim/files/gdb
deleted file mode 100644 (file)
index 5f59737..0000000
--- a/editors/macvim/files/gdb
+++ /dev/null
@@ -1,25 +0,0 @@
-set gdbdistfile vimgdb72-1.14.tar.gz
-variant gdb description {Enable GDB integration} {
-       depends_build-append    bin:gnutar:gnutar
-       master_sites-append             sourceforge:clewn:gdb
-       distfiles-append                ${gdbdistfile}:gdb
-       checksums-append                ${gdbdistfile} md5 e406c64d29a3152a3f5d0fffe3d2bba8
-       configure.args-append   --enable-gdb
-       patchfiles-append               patch-gdb.c patch-option.c
-       post-extract {
-               system "gnutar xvfz ${distpath}/${gdbdistfile} -C ${workpath}"
-       }
-       pre-patch {
-               system "patch -d ${worksrcpath} -F3 -p1 < \
-                       ${workpath}/vimgdb/vim72.diff || /usr/bin/true"
-       }
-       post-destroot {
-               set appPath "${destroot}${applications_dir}/MacVim.app"
-               set runtimePath "${appPath}/Contents/Resources/vim/runtime"
-               system "gnutar xvfz ${workpath}/vimgdb/vimgdb_runtime.tgz \
-                       -C ${runtimePath}"
-               system "${appPath}/Contents/MacOS/Vim \
-                       --cmd \"helptag ${runtimePath}/doc\" \
-                       --cmd exit"
-       }
-}

diff --git a/editors/macvim/files/patch-gdb.c b/editors/macvim/files/patch-gdb.c
deleted file mode 100644 (file)
index 8d9ca87..0000000
--- a/editors/macvim/files/patch-gdb.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- gdb.c.orig
-+++ gdb.c
-@@ -1605,7 +1605,7 @@
-     if (this->buf == NULL)
-     {
-       p_mm = MAXMEM;  /* buffer max virtual memory */
--      (void)do_ecmd(0, name, NULL, NULL, ECMD_ONE, ECMD_HIDE);
-+      (void)do_ecmd(0, name, NULL, NULL, ECMD_ONE, ECMD_HIDE, NULL);
-       p_mm = s_mm;
- 
-       vim_free(name);                 /* free name with vim_free */
-@@ -1665,7 +1665,7 @@
-     if (win_split(0, WSP_BOT) == OK)
-     {
-       /* create the asm buffer empty */
--      (void)do_ecmd(0, NULL, NULL, NULL, ECMD_ONE, ECMD_HIDE);
-+      (void)do_ecmd(0, NULL, NULL, NULL, ECMD_ONE, ECMD_HIDE, NULL);
-       gdb_as_setname(name);
- # ifdef FEAT_AUTOCMD
-       /* allow autocommands for loading syntax */
-@@ -1972,7 +1972,7 @@
-       }
- 
-       (void)do_ecmd(0, fpn, NULL, NULL, lnum,
--                    (P_HID(curbuf) ? ECMD_HIDE : 0) + ECMD_OLDBUF);
-+                    (P_HID(curbuf) ? ECMD_HIDE : 0) + ECMD_OLDBUF, NULL);
-     }
-     else if (buf != curbuf)
-       set_curbuf(buf, DOBUF_GOTO);

diff --git a/editors/macvim/files/patch-option.c b/editors/macvim/files/patch-option.c
deleted file mode 100644 (file)
index 2d9cd44..0000000
--- a/editors/macvim/files/patch-option.c
+++ /dev/null
@@ -1,56 +0,0 @@
---- option.c.orig
-+++ option.c
-@@ -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,
--                          {(char_u *)"gdb-variables", (char_u *)0L} },
--    {"gdbprg",            "gdp",  P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
--                          (char_u *)&p_gdp, PV_NONE,
--                          {(char_u *)"gdb", (char_u *)0L} },
--#endif
-     {"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,
-+                          {(char_u *)"gdb-variables", (char_u *)0L} },
-+    {"gdbprg",            "gdp",  P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
-+                          (char_u *)&p_gdp, PV_NONE,
-+                          {(char_u *)"gdb", (char_u *)0L} },
-+#endif
-     {"gdefault",    "gd",   P_BOOL|P_VI_DEF|P_VIM,
-                           (char_u *)&p_gd, PV_NONE,
-                           {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},