macvim 20091002

diff --git a/PortIndex b/PortIndex
index 826d9af..f0f0dea 100644 (file)
--- a/PortIndex
+++ b/PortIndex
@@ -7,7 +7,7 @@ variants universal depends_build {port:autoconf port:automake port:libtool} port
 fmdiff 781
 portdir devel/fmdiff description {Wrapper scripts for FileMerge} depends_fetch port:subversion homepage http://ssel.vub.ac.be/ssel/internal:fmdiff epoch 0 platforms darwin name fmdiff maintainers nomaintainer@macports.org long_description {Apple's Developer Tools for Mac OS X include FileMerge, a graphical tool to compare and merge files. FileMerge can be much handier to use, unfortunately, it doesn't integrate with Subversion straightforwardly. It can be opened from the command line with the opendiff command, but its interface differs from that of diff and diff3. It returns immediately (i.e. it forks and does not block) and it expects different arguments. Some wrapper scripts are thus required to call FileMerge from Subversion.} categories devel version 7819 revision 0
 macvim 563
-variants {perl python ruby tcl cscope standalone universal} 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 depends_lib {port:cmigemo port:gettext port:libiconv port:ncurses} name macvim 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.} maintainers nomaintainer depends_extract bin:unzip:unzip categories editors version 20090928 revision 0
+variants {perl python ruby tcl cscope standalone universal} 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 depends_lib {port:cmigemo port:gettext port:libiconv port:ncurses} name macvim 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.} maintainers nomaintainer depends_extract bin:unzip:unzip categories editors version 20091002 revision 0
 vim-app 601
 variants {xim perl python ruby tcl cscope darwin_ppc gdb aqua cocoa universal} depends_build {bin:gnutar:gnutar bin:grep:grep bin:7za:p7zip} 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 depends_lib {port:ncurses port:gettext port:libiconv port:ctags} name vim-app 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.} maintainers nomaintainer categories editors version 7.2.147 revision 2
 vim-cocoa 476

diff --git a/Readme.txt b/Readme.txt
index 98dd37a..719bcae 100644 (file)
--- a/Readme.txt
+++ b/Readme.txt
@@ -2,7 +2,7 @@
   cmigemo @1.3c_8+universal+utf8 (active)
   ctags-objc-ja @20090508_0+universal (active)
   iTerm @0.9.6_20090916 (active)
-  macvim @20090928_0+cscope+perl+python+ruby+standalone+universal (active)
+  macvim @20091002_0+cscope+perl+python+ruby+standalone+universal (active)
   stone @2.3e_0+ssl (active)
   vimproc @20090909_0+universal (active)
   zsh-devel @4.3.10_0+cjk+doc+examples+mp_completion+pcre (active)

diff --git a/editors/macvim/Portfile b/editors/macvim/Portfile
index 3d87d66..5f67b24 100644 (file)
--- a/editors/macvim/Portfile
+++ b/editors/macvim/Portfile
@@ -2,7 +2,7 @@
 PortSystem     1.0
 
 name                           macvim
-version                                20090928
+version                                20091002
 revision                       0
 categories                     editors
 platforms                      darwin
@@ -15,8 +15,8 @@ homepage                      http://code.google.com/p/macvim-kaoriya/
 set gittag                     ${version}
 distname                       KaoriYa-${gittag}
 use_zip                                yes
-checksums                      \
-       ${distname}.zip sha1 ff55a63c0fe854b6447df0b0990c363640d0a26a
+checksums                      ${distname}.zip sha1 \
+                                               f93d33980fad4d4bc2d4bd124dcfa033fb5bddda
 master_sites           \
        "http://repo.or.cz/w/MacVim/KaoriYa.git?a=snapshot;h=${gittag};sf=zip&"
 worksrcdir                     KaoriYa/src
@@ -28,10 +28,7 @@ depends_lib                  port:cmigemo \
                                        port:ncurses
 
 configure.pre_args     --prefix=${applications_dir}
-configure.args         --enable-gui=macvim \
-                                       --without-x \
-                                       --disable-gpm \
-                                       --with-features=huge \
+configure.args         --with-features=huge \
                                        --enable-multibyte \
                                        --enable-netbeans \
                                        --with-tlib=ncurses
@@ -39,12 +36,9 @@ configure.cppflags   -I${prefix}/include
 configure.ldflags      -L${prefix}/lib
 
 if {[variant_isset universal]} {
-       configure.compiler gcc-4.0
        set macosx_deployment_target 10.5
-       configure.args-append   --with-mac-arch=both
-       set xcodeconfig Universal
-} else {
-       set xcodeconfig Release
+       configure.args-append   --with-macarchs="${universal_archs}" \
+                                                       --with-macsdk="${macosx_deployment_target}"
 }
 
 use_parallel_build     yes
@@ -59,7 +53,6 @@ variant python description {Enable Python scripting} {
 }
 variant ruby description {Enable Ruby scripting} {
        configure.args-append   --enable-rubyinterp
-       configure.env-append    ARCHFLAGS="-L${prefix}/lib"
        depends_lib-append              bin:ruby:ruby
 }
 variant tcl description {Enable Tcl scripting} {
@@ -76,16 +69,11 @@ post-patch {
                ${worksrcpath}/MacVim/mvim
 }
 
-post-build {
-       system "cd ${worksrcpath}/po; make ja_JP.UTF-8.mo"
-       system "cd ${worksrcpath}/MacVim; xcodebuild -configuration ${xcodeconfig}"
-}
-
 set appPath "${destroot}${applications_dir}/MacVim.app/Contents"
 set runtimePath "${appPath}/Resources/vim/runtime"
 
 destroot {
-       file copy ${worksrcpath}/MacVim/build/${xcodeconfig}/MacVim.app ${destroot}${applications_dir}
+       file copy ${worksrcpath}/MacVim/build/Release/MacVim.app ${destroot}${applications_dir}
        xinstall -m 755 ${worksrcpath}/MacVim/mvim ${destroot}${prefix}/bin
        xinstall -d 755 ${runtimePath}/lang/ja_JP.UTF-8/LC_MESSAGES
        xinstall -m 644 ${worksrcpath}/po/ja_JP.UTF-8.mo \