[33299] trunk/dports/editors/vim-app

[raimue at macports.org]

Revision: 33299
          http://trac.macosforge.org/projects/macports/changeset/33299
Author:   raimue at macports.org
Date:     2008-01-23 01:50:44 -0800 (Wed, 23 Jan 2008)

Log Message:
-----------
editors/vim-app:
 * Install to /Applications/MacPorts/Vim.app instead of another subdirectory
 * GVim.app gets installed for ppc only (instead of "not i386")

Modified Paths:
--------------
    trunk/dports/editors/vim-app/Portfile
    trunk/dports/editors/vim-app/files/gvim.sh

Modified: trunk/dports/editors/vim-app/Portfile
===================================================================
--- trunk/dports/editors/vim-app/Portfile	2008-01-23 09:39:15 UTC (rev 33298)
+++ trunk/dports/editors/vim-app/Portfile	2008-01-23 09:50:44 UTC (rev 33299)
@@ -7,6 +7,7 @@
 set vim_version     7.1
 set vim_patchlevel  228
 version             ${vim_version}.${vim_patchlevel}
+revision            1
 categories          editors
 maintainers         raimue
 description         Vim.app is a GUI version of the famous editor vim.
@@ -52,7 +53,7 @@
 set appPath "/Applications/MacPorts/"
 depends_lib         port:gettext \
                     port:ncurses
-configure.pre_args  --prefix=${appPath}/Vim
+configure.pre_args  --prefix=${appPath}
 configure.args      --enable-gui=carbon \
                     --without-x \
                     --disable-gpm \
@@ -74,18 +75,18 @@
 
 destroot {
     # create the required directories
-    xinstall -d -m 755 ${destroot}${appPath}Vim
+    xinstall -d -m 755 ${destroot}${appPath}
     # copy Vim.app
-    file copy ${worksrcpath}/src/Vim.app ${destroot}${appPath}Vim
+    file copy ${worksrcpath}/src/Vim.app ${destroot}${appPath}
     xinstall -m 644 ${filespath}/vimrc ${filespath}/gvimrc \
-      ${destroot}${appPath}Vim/Vim.app
+      ${destroot}${appPath}Vim.app
     xinstall -m 644 ${workpath}/doc-txt.icns \
-      ${destroot}${appPath}Vim/Vim.app/Contents/Resources
+      ${destroot}${appPath}Vim.app/Contents/Resources
     xinstall -m 644 ${workpath}/app.icns \
-      ${destroot}${appPath}Vim/Vim.app/Contents/Resources/gui_mac.icns
+      ${destroot}${appPath}Vim.app/Contents/Resources/gui_mac.icns
     # remove the broken link to 'runtime', copy the folder instead
     set runtimePath \
-      "${destroot}${appPath}Vim/Vim.app/Contents/Resources/vim/runtime"
+      "${destroot}${appPath}Vim.app/Contents/Resources/vim/runtime"
     file delete ${runtimePath}
     file copy ${worksrcpath}/runtime ${runtimePath}
     # fix permissions
@@ -93,16 +94,15 @@
             file attributes ${f} -permissions 0644
     }
     # install launchscript
-    xinstall -m 755 ${filespath}/gvim.sh \
-      ${destroot}/${prefix}/bin/gvim
+    xinstall -m 755 ${filespath}/gvim.sh ${destroot}/${prefix}/bin/gvim
+    reinplace "s|@APPPATH@|${appPath}|g" ${destroot}/${prefix}/bin/gvim
+
     # allow for Vim.App to open .nfo, .vim, .latex, .tex, .diff files
-    system "patch -d ${destroot}/${appPath}Vim/Vim.app/Contents/ -p0 < ${filespath}/patch-Info.plist"
+    system "patch -d ${destroot}${appPath}Vim.app/Contents/ -p0 < ${filespath}/patch-Info.plist"
     # copy GVim.app (ppc only)
-    if {![variant_isset darwin_i386]} {
-        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
+    if {[variant_isset darwin_ppc]} {
+        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
     }
 }
 
@@ -152,7 +152,7 @@
     depends_lib-append      port:gettext
 }
 
-platform darwin i386 {
+platform darwin ppc {
 }
 
 include serverlist

Modified: trunk/dports/editors/vim-app/files/gvim.sh
===================================================================
--- trunk/dports/editors/vim-app/files/gvim.sh	2008-01-23 09:39:15 UTC (rev 33298)
+++ trunk/dports/editors/vim-app/files/gvim.sh	2008-01-23 09:50:44 UTC (rev 33299)
@@ -12,7 +12,7 @@
 # or by un-commenting and editing the following line:
 # VIM_APP_DIR=/Applications
 
-binary="/Applications/MacPorts/Vim/Vim.app/Contents/MacOS/Vim"
+binary="@APPPATH at Vim.app/Contents/MacOS/Vim"
 
 # Next, peek at the name used to invoke this script, and set options
 # accordingly.

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