macvim 20090711

diff --git a/editors/macvim/Portfile b/editors/macvim/Portfile
index 4dc5fca..3009646 100644 (file)
--- a/editors/macvim/Portfile
+++ b/editors/macvim/Portfile
@@ -2,7 +2,7 @@
 PortSystem     1.0
 
 name                           macvim
-version                                20090710
+version                                20090711
 revision                       0
 categories                     editors
 platforms                      darwin
@@ -12,12 +12,11 @@ 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                     ba738f99cdb041b8036d3a5347f423ebe0ab8049
+set gittag                     ${version}
 distname                       KaoriYa-${gittag}
 use_zip                                yes
 checksums                      \
-       ${distname}.zip sha1 9e5051886dff986083fe383127d2b925eb06c0c5
+       ${distname}.zip sha1 d97ac8ee921953bcc20f3eaf001e1ee4556c49e2
 master_sites           \
        "http://repo.or.cz/w/MacVim/KaoriYa.git?a=snapshot;h=${gittag};sf=zip&"
 worksrcdir                     KaoriYa/src
@@ -26,8 +25,7 @@ extract.only          ${distname}.zip
 depends_lib                    port:cmigemo \
                                        port:gettext \
                                        port:libiconv \
-                                       port:ncurses \
-                                       port:vimproc
+                                       port:ncurses
 
 configure.pre_args     --prefix=${applications_dir}
 configure.args         --enable-gui=macvim \
@@ -103,6 +101,7 @@ destroot {
 test.run                       yes
 
 variant standalone description {Enable standalonize} {
+       depends_lib-append port:vimproc port:clewn
        configure.env-append    PATH="/usr/bin:${env(PATH)}"
        configure.cppflags-append       -DDYNAMIC_PERL -DDYNAMIC_PYTHON -DDYNAMIC_RUBY
        post-configure {
@@ -111,13 +110,32 @@ variant standalone description {Enable standalonize} {
                reinplace "s|^RUBY_LIBS|#RUBY_LIBS|" ${worksrcpath}/auto/config.mk
        }
        post-destroot {
+               # ctags
+               file copy ${prefix}/bin/ctags ${appPath}/MacOS
+
+               # vimproc
+               set vimprocPath ${prefix}/share/vimproc/autoload
+               file copy ${vimprocPath}/proc.so ${runtimePath}/autoload
+               file copy ${vimprocPath}/proc.vim ${runtimePath}/autoload
+
+               # clewn
+               file copy ${prefix}/bin/clewn ${appPath}/MacOS
+               set clewnPath ${prefix}/share/clewn
+               file copy ${clewnPath}/.clewn_keys ${runtimePath}
+               file copy ${clewnPath}/clewn.vim ${runtimePath}
+               file copy ${clewnPath}/doc/clewn.txt ${runtimePath}/doc
+               file copy ${clewnPath}/macros/clewn_mappings.vim ${runtimePath}/macros
+               file copy ${clewnPath}/syntax/gdbvar.vim ${runtimePath}/syntax
+
                # dylibs
-               foreach dylib {intl.8 iconv.2 migemo.1 ncurses.5} {
+               foreach dylib {intl.8 iconv.2 migemo.1 ncurses.5 readline.6} {
                        set libname [lindex [split ${dylib} .] 0]
                        set instname "@executable_path/../Frameworks/lib${libname}.dylib"
                        set origname "${prefix}/lib/lib${dylib}.dylib"
-                       system "install_name_tool \
-                               -change ${origname} ${instname} ${appPath}/MacOS/Vim"
+                       foreach exec {MacOS/Vim MacOS/clewn} {
+                               system "install_name_tool \
+                                       -change ${origname} ${instname} ${appPath}/${exec}"
+                       }
                        if {[file type ${origname}] == "link"} {
                                set realpath "${prefix}/lib/"
                                append realpath [file readlink ${origname}]
@@ -131,6 +149,10 @@ variant standalone description {Enable standalonize} {
                        -change ${prefix}/lib/libiconv.2.dylib \
                        @executable_path/../Frameworks/libiconv.dylib \
                        ${appPath}/Frameworks/libintl.dylib"
+               system "install_name_tool \
+                       -change ${prefix}/lib/libncurses.5.dylib \
+                       @executable_path/../Frameworks/libncurses.dylib \
+                       ${appPath}/Frameworks/libreadline.dylib"
 
                # migemo dicts
                xinstall -d 755 ${runtimePath}/dict
@@ -140,12 +162,8 @@ 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
+               # vim tags
+               system "${appPath}/MacOS/Vim \
+                       --cmd \":helptag ${runtimePath}/doc\" --cmd :quit"
        }
 }