[21938] trunk/dports/editors/vim/Portfile

[source_changes at macosforge.org]

Revision: 21938
          http://trac.macosforge.org/projects/macports/changeset/21938
Author:   pipping at macports.org
Date:     2007-02-11 14:56:08 -0800 (Sun, 11 Feb 2007)

Log Message:
-----------
 * fix aqua variant
 * remove warning

Modified Paths:
--------------
    trunk/dports/editors/vim/Portfile

Modified: trunk/dports/editors/vim/Portfile
===================================================================
--- trunk/dports/editors/vim/Portfile	2007-02-11 22:42:02 UTC (rev 21937)
+++ trunk/dports/editors/vim/Portfile	2007-02-11 22:56:08 UTC (rev 21938)
@@ -5,7 +5,7 @@
 set vim_version	    7.0
 set vim_patchlevel  192
 version             ${vim_version}.${vim_patchlevel}
-revision            1
+revision            2
 categories          editors
 maintainers         pipping at macports.org
 description         Vi "workalike" with many additional features
@@ -103,25 +103,33 @@
                                 http://www.douglas.stebila.ca/files/code/vim/doc/:doc_aqua
     distfiles-append        app-bm.tar.gz:app_aqua \
                                 doc.tar.gz:doc_aqua
+    set appPath "/Applications/MacPorts"
+    configure.pre_args      --prefix=${appPath}/Vim
     configure.args-delete   --enable-gui=no
     configure.args-append   --enable-gui=carbon
     post-extract {
         system "gnutar xvfz ${distpath}/app-bm.tar.gz -C ${workpath}"
         system "gnutar xvfz ${distpath}/doc.tar.gz -C ${workpath}"
     }
-    post-destroot {
-        set appPath /Applications/MacPorts
+    pre-destroot {
+        set appPath "/Applications/MacPorts"
         xinstall -d -m 755 ${destroot}${appPath}
-        system "gnutar xvfz ${filespath}/GVim_app.tar.gz \
-            -C ${destroot}${appPath}"
-        xinstall -m 644 ${workpath}/app.icns \
-            ${destroot}${appPath}/GVim.app/Contents/Resources/appIcon.icns
         xinstall -d -m 755 ${destroot}${appPath}/Vim
-        system "rm -f ${worksrcpath}/src/Vim.app/Contents/Resources/vim/runtime"
+    }
+    post-destroot {
+        set appPath "/Applications/MacPorts"
+        xinstall -d ${destroot}${appPath}/Vim/Vim.app/Contents/Resources/vim
         system "cp -R ${worksrcpath}/runtime \
-            ${worksrcpath}/src/Vim.app/Contents/Resources/vim"
-        system "cp -R ${worksrcpath}/src/Vim.app \
-            ${destroot}${appPath}/Vim/Vim.app"
+            ${destroot}${appPath}/Vim/Vim.app/Contents/Resources/vim/"
+        delete ${destroot}${prefix}/var
+        system "ln -f ${destroot}${appPath}/Vim/Vim.app/Contents/MacOS/Vim \
+            ${destroot}/${prefix}/bin/vim"
+        system "gnutar xvfz ${filespath}/GVim_app.tar.gz -C \
+            ${destroot}${appPath}"
+        xinstall -m 755 ${filespath}/gvim.sh \
+            ${destroot}/${prefix}/bin/gvim
+        xinstall -m 644 ${workpath}/app.icns \
+            ${destroot}${appPath}/GVim.app/Contents/Resources/appIcon.icns
         xinstall -m 644 ${filespath}/gvimrc \
             ${destroot}${appPath}/Vim/Vim.app/
         xinstall -m 644 ${filespath}/vimrc \
@@ -130,16 +138,7 @@
             ${destroot}${appPath}/Vim/Vim.app/Contents/Resources/
         xinstall -m 644 ${workpath}/app.icns \
             ${destroot}${appPath}/Vim/Vim.app/Contents/Resources/gui_mac.icns
-        system "ln -f ${destroot}${appPath}/Vim/Vim.app/Contents/MacOS/Vim \
-            ${destroot}/${prefix}/bin/vim"
-        xinstall -m 755 ${filespath}/gvim.sh ${destroot}/${prefix}/bin/gvim
     }
-    post-install {
-        ui_msg "===============================================================================\n"
-        ui_msg "  Vim's variant aqua can reportedly cause trouble when upgrading from an old   "
-        ui_msg "    version. Uninstallation and reinstallation are therefore recommended.    \n"
-        ui_msg "===============================================================================\n"
-    }
 }
 
 variant athena {

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070211/f3287076/attachment.html