[23756] trunk/dports/editors

source_changes at macosforge.org source_changes at macosforge.org
Sun Apr 8 17:33:27 PDT 2007


Revision: 23756
          http://trac.macosforge.org/projects/macports/changeset/23756
Author:   pipping at macports.org
Date:     2007-04-08 17:33:26 -0700 (Sun, 08 Apr 2007)

Log Message:
-----------
 * split up vim into vim, vim-app, handing over vim-app to raimue at codingfarm.de
 * remove variants gnome, gnome2 which were comments only since r6711.

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

Added Paths:
-----------
    trunk/dports/editors/vim-app/
    trunk/dports/editors/vim-app/Portfile
    trunk/dports/editors/vim-app/files/
    trunk/dports/editors/vim-app/files/GVim_app.tar.gz
    trunk/dports/editors/vim-app/files/checksums_dist
    trunk/dports/editors/vim-app/files/checksums_patch
    trunk/dports/editors/vim-app/files/gvim.sh
    trunk/dports/editors/vim-app/files/gvimrc
    trunk/dports/editors/vim-app/files/patch-Info.plist
    trunk/dports/editors/vim-app/files/patch-if_ruby.c
    trunk/dports/editors/vim-app/files/vimrc

Removed Paths:
-------------
    trunk/dports/editors/vim/files/GVim_app.tar.gz
    trunk/dports/editors/vim/files/gvim.sh
    trunk/dports/editors/vim/files/gvimrc
    trunk/dports/editors/vim/files/patch-Info.plist
    trunk/dports/editors/vim/files/vimrc

Modified: trunk/dports/editors/vim/Portfile
===================================================================
--- trunk/dports/editors/vim/Portfile	2007-04-08 22:41:24 UTC (rev 23755)
+++ trunk/dports/editors/vim/Portfile	2007-04-09 00:33:26 UTC (rev 23756)
@@ -87,109 +87,33 @@
 
 test.run            yes
 
-variant aqua conflicts athena gtk1 gtk2 motif {
-    master_sites-append \
-      http://www.douglas.stebila.ca/files/code/vim/app/:app_aqua \
-        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}"
-    }
-    destroot {
-        set appPath "/Applications/MacPorts/"
-        # create the required directories
-        xinstall -d -m 755 ${destroot}${appPath}Vim
-        xinstall -d -m 755 ${destroot}${prefix}/bin
-        # copy Vim.app
-        file copy ${worksrcpath}/src/Vim.app ${destroot}${appPath}Vim
-        xinstall -m 644 ${filespath}/vimrc ${filespath}/gvimrc \
-          ${destroot}${appPath}Vim/Vim.app
-        xinstall -m 644 ${workpath}/doc-txt.icns \
-          ${destroot}${appPath}Vim/Vim.app/Contents/Resources
-        xinstall -m 644 ${workpath}/app.icns \
-          ${destroot}${appPath}Vim/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"
-        file delete ${runtimePath}
-        file copy ${worksrcpath}/runtime ${runtimePath}
-        # fix permissions
-        foreach f [glob ${runtimePath}/autoload/*.vim] {
-                file attributes ${f} -permissions 0644
-        }
-        # create a link to the executable
-        file link -hard ${destroot}${prefix}/bin/vim \
-          ${destroot}${appPath}Vim/Vim.app/Contents/MacOS/Vim
-
-        # copy vimtutor
-        xinstall -m 755 ${worksrcpath}/src/vimtutor \
-          ${destroot}${prefix}/bin/
-        # install documentation
-        xinstall -d ${destroot}/${prefix}/share/man/man1
-        cd ${destroot}${appPath}Vim/Vim.app/Contents/Resources/vim/runtime/doc
-        foreach manPage [glob *.1] {
-            file link -hard ${destroot}${prefix}/share/man/man1/${manPage} \
-              ./${manPage}
-        }
-        # install launchscript
-        xinstall -m 755 ${filespath}/gvim.sh \
-          ${destroot}/${prefix}/bin/gvim
-        # allow for Vim.App to open .nfo, .vim, .latex, .tex, .diff files
-        cd ${destroot}${appPath}Vim/Vim.app/Contents/
-        system "patch -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
-        }
-    }
-}
-
-variant athena conflicts aqua gtk1 gtk2 motif {
+variant athena conflicts gtk1 gtk2 motif {
     configure.args-delete   --enable-gui=no --without-x
     configure.args-append   --enable-gui=athena --with-x --disable-darwin
     depends_lib-append      lib:libX11:XFree86
 }
-variant gtk1 conflicts aqua athena gtk2 motif {
+variant gtk1 conflicts athena gtk2 motif {
     configure.args-delete   --enable-gui=no --without-x
     configure.args-append   --enable-gui=gtk --with-x --disable-darwin
     depends_lib-append      lib:libgtk.1:gtk1
 }
-variant gtk2 conflicts aqua athena gtk1 motif {
+variant gtk2 conflicts athena gtk1 motif {
     configure.args-delete   --enable-gui=no --without-x
     configure.args-append   --enable-gui=gtk2 --with-x --disable-darwin
     depends_lib-append      lib:libgtk.2:gtk2
 }
-variant motif conflicts aqua athena gtk1 gtk2 {
+variant motif conflicts athena gtk1 gtk2 {
     configure.args-delete   --enable-gui=no --without-x
     configure.args-append   --enable-gui=motif --with-x --disable-darwin
     depends_lib-append      lib:libXm:openmotif
 }
-#variant gnome {
-#   configure.args-delete   --enable-gui=no --without-x
-#   configure.args-append   --enable-gui=gnome --with-x --disable-darwin
-# What for depends?
-#}
-#variant gnome2 {
-#   configure.args-delete   --enable-gui=no --without-x
-#   configure.args-append   --enable-gui=gnome2 --with-x --disable-darwin
-# What for depends?
-#}
 
-variant tiny    conflicts aqua  { configure.args-append --with-features=tiny }
-variant small   conflicts aqua  { configure.args-append --with-features=small }
-variant big                     { configure.args-append --with-features=big }
-variant huge                    { configure.args-append --with-features=huge }
-variant multibyte               { configure.args-append --enable-multibyte }
-variant xim                     { configure.args-append --with-xim }
+variant tiny              { configure.args-append --with-features=tiny }
+variant small             { configure.args-append --with-features=small }
+variant big               { configure.args-append --with-features=big }
+variant huge              { configure.args-append --with-features=huge }
+variant multibyte         { configure.args-append --enable-multibyte }
+variant xim               { configure.args-append --with-xim }
 
 variant perl {
     configure.args-append   --enable-perlinterp
@@ -212,8 +136,5 @@
     configure.args-append   --enable-cscope
 }
 
-platform darwin i386 {
-}
-
 include checksums_dist
 include checksums_patch

Deleted: trunk/dports/editors/vim/files/GVim_app.tar.gz
===================================================================
(Binary files differ)

Deleted: trunk/dports/editors/vim/files/gvim.sh
===================================================================
--- trunk/dports/editors/vim/files/gvim.sh	2007-04-08 22:41:24 UTC (rev 23755)
+++ trunk/dports/editors/vim/files/gvim.sh	2007-04-09 00:33:26 UTC (rev 23756)
@@ -1,54 +0,0 @@
-#!/bin/sh
-#
-# This shell script passes all its arguments to the binary inside the Vim.app
-# application bundle.  If you make links to this script as view, gvim, etc.,
-# then it will peek at the name used to call it and set options appropriately.
-#
-# Based on a script by Wout Mertens and suggestions from Laurent Bihanic.
-# This version is the fault of Benji Fisher, 16 May 2005.
-
-# First, check "All the Usual Suspects" for the location of the Vim.app bundle.
-# You can short-circuit this by setting the VIM_APP_DIR environment variable
-# or by un-commenting and editing the following line:
-# VIM_APP_DIR=/Applications
-
-binary="/Applications/MacPorts/Vim/Vim.app/Contents/MacOS/Vim"
-
-# Next, peek at the name used to invoke this script, and set options
-# accordingly.
-
-name="`basename "$0"`"
-gui=
-opts=
-
-# GUI mode, implies forking
-case "$name" in g*|rg*) gui=true ;; esac
-
-# Restricted mode
-case "$name" in r*) opts="$opts -Z";; esac
-
-# vimdiff and view
-case "$name" in
-	*vimdiff)
-		opts="$opts -dO"
-		;;
-	*view)
-		opts="$opts -R"
-		;;
-esac
-
-# Last step:  fire up vim.
-# GUI mode will always create a new Vim instance, because Vim can't have
-# more than one graphic window yet.
-# The program should fork by default when started in GUI mode, but it does
-# not; we work around this when this script is invoked as "gvim" or "rgview"
-# etc., but not when it is invoked as "vim -g".
-if [ "$gui" ]; then
-	# Note: this isn't perfect, because any error output goes to the
-	# terminal instead of the console log.
-	# But if you use open instead, you will need to fully qualify the
-	# path names for any filenames you specify, which is hard.
-	exec "$binary" -g $opts ${1:+"$@"} &
-else
-	exec "$binary" $opts ${1:+"$@"}
-fi

Deleted: trunk/dports/editors/vim/files/gvimrc
===================================================================
--- trunk/dports/editors/vim/files/gvimrc	2007-04-08 22:41:24 UTC (rev 23755)
+++ trunk/dports/editors/vim/files/gvimrc	2007-04-09 00:33:26 UTC (rev 23756)
@@ -1,200 +0,0 @@
-" System gvimrc file for Mac OS X
-" Author:  Benji Fisher <benji at member.AMS.org>
-" Last modified:  10 February 2003
-
-" If you want to get more Mac-like behavior, leave the "finish" line
-" commented out.  For vim-standard menus, uncomment this line so that the rest
-" of the file will be ignored.
-
-" finish
-
-" TODO:  Decide whether to leave it in non-compatible mode.
-" For now, save and restore.
-let s:save_cpo = &cpo
-set cpo&vim
-
-" Define mac-standard menu items and keyboard shortcuts.
-
-aunmenu &File.&New
-amenu 10.325 &File.&New<Tab><D-n> <D-n>
-nmap <D-n> :confirm enew<CR>
-vmap <D-n> <Esc><D-n>gv
-imap <D-n> <C-O><D-n>
-cmap <D-n> <C-C><D-n>
-omap <D-n> <Esc><D-n>
-aunmenu &File.&Open\.\.\.
-amenu 10.310 &File.&Open\.\.\.<Tab><D-o> <D-o>
-nmap <D-o> :browse confirm e<CR>
-vmap <D-o> <Esc><D-o>gv
-imap <D-o> <C-O><D-o>
-cmap <D-o> <C-C><D-o>
-omap <D-o> <Esc><D-o>
-aunmenu &File.&Close
-amenu 10.330 &File.&Close<Tab><D-w> <D-w>
-nmap <silent> <D-w> :if winheight(2) < 0 <Bar>
-	\   confirm enew <Bar>
-	\ else <Bar>
-	\   confirm close <Bar>
-	\ endif<CR>
-vmap <D-w> <Esc><D-w>gv
-imap <D-w> <C-O><D-w>
-cmap <D-w> <C-C><D-w>
-omap <D-w> <Esc><D-w>
-aunmenu &File.&Save
-amenu 10.340 &File.&Save<Tab><D-s> <D-s>
-nmap <silent> <D-s> :if expand("%") == ""<Bar>browse confirm w<Bar>
-	\ else<Bar>confirm w<Bar>endif<CR>
-vmap <D-s> <Esc><D-s>gv
-imap <D-s> <C-O><D-s>
-cmap <D-s> <C-C><D-s>
-omap <D-s> <Esc><D-s>
-aunmenu &File.Save\ &As\.\.\.
-amenu 10.350 &File.Save\ &As\.\.\.<Tab><D-S>	<D-S-s>
-nmap <D-S-s> :browse confirm saveas<CR>
-vmap <D-S-s> <Esc><D-s>gv
-imap <D-S-s> <C-O><D-s>
-cmap <D-S-s> <C-C><D-s>
-omap <D-S-s> <Esc><D-s>
-" map <D-p> ??
-" <D-q> is handled by the OS.
-"amenu File.Quit<Tab><D-q> <D-q>
-"nmap <D-q> :confirm qall<CR>
-"vmap <D-q> <Esc><D-q>gv
-"imap <D-q> <C-O><D-q>
-"cmap <D-q> <C-C><D-q>
-"omap <D-q> <Esc><D-q>
-" From the Edit menu of SimpleText:
-aunmenu &Edit.&Undo
-amenu 20.310 &Edit.&Undo<Tab><D-z> <D-z>
-nmap <D-z> u
-vmap <D-z> <Esc><D-z>gv
-imap <D-z> <C-O><D-z>
-cmap <D-z> <C-C><D-z>
-omap <D-z> <Esc><D-z>
-vunmenu &Edit.Cu&t
-vmenu 20.340 &Edit.Cu&t<Tab><D-x> <D-x>
-vmap <D-x> "+x
-vunmenu &Edit.&Copy
-vmenu 20.350 &Edit.&Copy<Tab><D-c> <D-c>
-vmap <D-c> "+y
-cunmenu &Edit.&Copy
-cmenu 20.350 &Edit.&Copy<Tab><D-c> <D-c>
-cmap <D-c> <C-Y>
-aunmenu &Edit.&Paste
-nmenu 20.360 &Edit.&Paste<Tab><D-v> <D-v>
-nmap <D-v> "+gP
-cmenu	     &Edit.&Paste<Tab><D-v> <D-v>
-cmap <D-v> <C-R>+
-vmenu	     &Edit.&Paste<Tab><D-v> <D-v>
-imenu	     &Edit.&Paste<Tab><D-v> <D-v>
-if has("virtualedit")
-  vmap <D-v> "-c<Esc><SID>Paste
-  imap <D-v> <Esc><SID>Pastegi
-else
-  vmap <D-v> "-c<Esc>gix<Esc><SID>Paste"_x
-  imap <D-v> x<Esc><SID>Paste"_s
-endif
-aunmenu &Edit.&Select\ All
-amenu 20.400 &Edit.Select\ &All<Tab><D-a>	<D-a>
-nmap <silent> <D-a> :if &slm != ""<Bar>exe ":norm gggH<C-O>G"<Bar>
-	\ else<Bar>exe ":norm ggVG"<Bar>endif<CR>
-vmap <D-a> <Esc><D-a>
-imap <D-a> <Esc><D-a>
-cmap <D-a> <C-C><D-a>
-omap <D-a> <Esc><D-a>
-aunmenu &Edit.&Find
-amenu 20.410 &Edit.&Find<Tab><D-f>	<D-f>
-nmap <D-f> /
-vmap <D-f> <Esc><D-f>
-imap <D-f> <Esc><D-f>
-cmap <D-f> <C-C><D-f>
-omap <D-f> <Esc><D-f>
-amenu 20.420 &Edit.&Next<Tab><D-g>	<D-g>
-nmap <D-g> n
-vmap <D-g> <Esc><D-g>
-imap <D-g> <C-O><D-g>
-cmap <D-g> <C-C><D-g>
-omap <D-g> <Esc><D-g>
-vmenu <silent> 20.420 &Edit.Find\ &Selection "9y/<C-R>9<CR>
-	\:if strlen(@9) > 1 <Bar>
-	\ exe 'norm!v/' . @9 . '/e' . "<Bslash><lt>CR>"<Bar>
-	\ else <Bar> exe "norm!v" <Bar> endif<CR>
-
-" Copied from $VIMRUNTIME/menu.vim:
-" Pasting blockwise and linewise selections is not possible in Insert and
-" Visual mode without the +virtualedit feature.  They are pasted as if they
-" were characterwise instead.  Add to that some tricks to leave the cursor in
-" the right position, also for "gi".
-if has("virtualedit")
-  nnoremap <silent> <script> <SID>Paste :call <SID>Paste()<CR>
-  func! <SID>Paste()
-    let ove = &ve
-    set ve=all
-    normal `^
-    if @+ != ''
-      normal "+gP
-    endif
-    let c = col(".")
-    normal i
-    if col(".") < c	" compensate for i<ESC> moving the cursor left
-      normal l
-    endif
-    let &ve = ove
-  endfunc
-else
-  nnoremap <silent> <script> <SID>Paste "=@+.'xy'<CR>gPFx"_2x
-endif
-
-" Add a Preferences... menu item to the Edit menu.
-amenu Edit.-SepPrefs- :
-amenu Edit.Preferences\.\.\. :call <SID>Preferences()<CR>
-
-fun! <SID>Preferences()
-	let prompt = "Choose one of the following:"
-	let prompt = prompt . "\r1 Set options for the current session."
-	let prompt = prompt . "\r2 Edit ~/.vimrc for future sessions."
-	let prompt = prompt . "\r3 Do 1 and 2, in split windows."
-	let prompt = prompt . "\r4 Edit ~/.gvimrc for future sessions."
-	let response = inputdialog(prompt, "1")
-	if response == 1
-		options
-	elseif response == 2
-		call s:EditVimrc("vimrc")
-	elseif response == 3
-		call s:EditVimrc()
-		options
-	elseif response == 4
-		call s:EditVimrc("gvimrc")
-	else
-		echohl WarningMsg
-		echo "Sorry:  1 or 2 or 3 or 4 expected."
-		echohl None
-	endif
-endfun
-
-fun! s:EditVimrc(rcfile)
-	if filewritable($HOME . "/." . a:rcfile)
-		let vimrc = $HOME . "/." . a:rcfile
-	elseif filewritable($HOME . "/_" . a:rcfile)
-		let vimrc = $HOME . "/_" . a:rcfile
-	else
-		let prompt = "Create a vimrc file in your home directory:"
-		let prompt = prompt . "\r." . a:rcfile . " is the Vim standard."
-		let prompt = prompt . "\r_" . a:rcfile . " is visible from Finder."
-		let prompt = prompt . "\rLeave blank to cancel:"
-		let vimrc = inputdialog(prompt, "." . a:rcfile)
-		if vimrc == ""
-			return
-		endif
-		let vimrc = $HOME . "/" . vimrc
-		let prompt = "Start with " a:rcfile . "_example.vim ?"
-		let template = inputdialog(prompt, "Yes")
-	endif
-	execute "split" vimrc
-	if exists("template") && template ==? "Yes"
-		execute "read" $VIMRUNTIME . "/" . a:rcfile . "_example.vim"
-		0put='\" Copied from $VIMRUNTIME/' . a:rcfile . '_example.vim'
-	endif
-endfun
-
-let &cpo = s:save_cpo

Deleted: trunk/dports/editors/vim/files/patch-Info.plist
===================================================================
--- trunk/dports/editors/vim/files/patch-Info.plist	2007-04-08 22:41:24 UTC (rev 23755)
+++ trunk/dports/editors/vim/files/patch-Info.plist	2007-04-09 00:33:26 UTC (rev 23756)
@@ -1,14 +0,0 @@
---- Info.plist	2007-03-03 19:46:34.000000000 +0100
-+++ /Users/pipping/macports-trunk/dports/editors/vim/files//patch-Info.plist	2007-03-03 19:52:37.000000000 +0100
-@@ -36,6 +36,11 @@
- 				<array>
- 					<string>txt</string>
- 					<string>text</string>
-+					<string>nfo</string>
-+					<string>vim</string>
-+					<string>latex</string>
-+					<string>tex</string>
-+					<string>diff</string>
- 				</array>
- 				<key>CFBundleTypeMIMETypes</key>
- 				<array>

Deleted: trunk/dports/editors/vim/files/vimrc
===================================================================
--- trunk/dports/editors/vim/files/vimrc	2007-04-08 22:41:24 UTC (rev 23755)
+++ trunk/dports/editors/vim/files/vimrc	2007-04-09 00:33:26 UTC (rev 23756)
@@ -1,21 +0,0 @@
-" System vimrc file for Mac OS X
-" Author:  Benji Fisher <benji at member.AMS.org>
-" Last modified:  23 February 2004
-
-" TODO:  Is there any way to test whether Vim.app was started from the Finder? 
-if has("gui_running")
-  " Get the value of $PATH from a login shell.
-  " If your shell is not on this list, it may be just because we have not
-  " tested it.  Try adding it to the list and see if it works.  If so,
-  " please post a note to the vim-mac list!
-  if $SHELL =~ '/\(sh\|csh\|bash\|tcsh\|zsh\)$'
-    let s:path = system("echo echo VIMPATH'${PATH}' | $SHELL -l")
-    let $PATH = matchstr(s:path, 'VIMPATH\zs.\{-}\ze\n')
-  endif
-  " Change directory on startup.
-  autocmd VimEnter * if getcwd()=="/" | if strlen(@%) | cd %:p:h | else | cd | endif | endif
-" If running in a Terminal window, set the terminal type to allow syntax
-" highlighting.
-" else
-"   set term=ansi
-endif

Added: trunk/dports/editors/vim-app/Portfile
===================================================================
--- trunk/dports/editors/vim-app/Portfile	                        (rev 0)
+++ trunk/dports/editors/vim-app/Portfile	2007-04-09 00:33:26 UTC (rev 23756)
@@ -0,0 +1,170 @@
+# $Id$
+PortSystem          1.0
+
+name                vim-app
+set realname        vim
+set vim_version     7.0
+set vim_patchlevel  224
+version             ${vim_version}.${vim_patchlevel}
+revision            0
+categories          editors
+maintainers         raimue at codingfarm.de
+description         Vi "workalike" with many additional features
+long_description    Vim is a virtually compatible, extremely \
+                      enhanced version of the vi editor.
+homepage            http://www.vim.org/
+platforms           darwin freebsd
+
+distfiles           ${realname}-${vim_version}.tar.bz2:vim \
+                      ${realname}-${vim_version}-extra.tar.gz:extra \
+                      ${realname}-${vim_version}-lang.tar.gz:extra \
+                      app-bm.tar.gz:app_aqua \
+                      doc.tar.gz:doc_aqua
+
+use_bzip2           yes
+
+set serverList {
+                    ftp://ftp.vim.org/pub/vim/ \
+                      http://ftp.vim.org/pub/vim/ \
+                      ftp://ftp.us.vim.org/pub/vim/ \
+                      ftp://ftp.ca.vim.org/pub/vim/ \
+                      ftp://ftp.nl.vim.org/pub/vim/ \
+                      ftp://ftp.uk.vim.org/pub/vim/ \
+                      ftp://ftp.ie.vim.org/pub/vim/ \
+                      ftp://ftp.is.vim.org/pub/vim/ \
+                      ftp://ftp.pl.vim.org/pub/vim/ \
+                      ftp://ftp.ro.vim.org/pub/vim/ \
+                      ftp://ftp.cz.vim.org/pub/vim/ \
+                      ftp://ftp.sk.vim.org/pub/vim/ \
+                      ftp://ftp.jp.vim.org/pub/vim/ \
+                      ftp://ftp.kr.vim.org/pub/vim/ \
+                      ftp://ftp2.us.vim.org/pub/vim/ \
+                      ftp://ftp9.us.vim.org/pub/vim/ \
+                      ftp://ftp2.nl.vim.org/pub/vim/ \
+                      ftp://ftp3.nl.vim.org/pub/vim/ \
+                      ftp://ftp3.de.vim.org/pub/vim/ \
+                      ftp://ftp2.tw.vim.org/pub/vim/ \
+                      ftp://miroir-francais.fr/pub/vim/ \
+                      ftp://ftp.tw.vim.org/pub/Unix/Editors/Vim/
+}
+
+# create list of locations for source, extras, patches from serverList
+foreach server ${serverList} {
+        lappend master_sites ${server}unix/:vim
+            lappend master_sites ${server}extra/:extra
+                lappend patch_sites ${server}patches/${vim_version}
+}
+master_sites-append \
+    http://www.douglas.stebila.ca/files/code/vim/app/:app_aqua \
+    http://www.douglas.stebila.ca/files/code/vim/doc/:doc_aqua
+
+patchfiles          patch-if_ruby.c
+
+dist_subdir         ${realname}
+distname            ${realname}[strsed ${vim_version} {g/[.]//}]
+
+eval {
+    set low 1
+    while {$low <= $vim_patchlevel} {
+        set high [expr $low + 99];
+        if {$high < $vim_patchlevel} {
+            patchfiles-append \
+              [format "%s.%03d-%03d.gz" $vim_version $low $high]
+            incr low 100
+        } else {
+            patchfiles-append [format "%s.%03d" $vim_version $low]
+            incr low 1
+        }
+    }
+}
+
+set appPath "/Applications/MacPorts/"
+depends_lib         port:gettext \
+                    port:ncurses
+configure.pre_args  --prefix=${appPath}/Vim
+configure.args      --enable-gui=carbon \
+                    --without-x \
+                    --disable-gpm \
+                    --mandir=${prefix}/share/man \
+                    --with-tlib=ncurses
+configure.env       CPPFLAGS="-I${prefix}/include" \
+                    LDFLAGS="-L${prefix}/lib"
+extract.only        ${realname}-${vim_version}${extract.suffix}
+post-extract {
+    system "gnutar xvfz ${distpath}/${realname}-${vim_version}-extra.tar.gz -C \
+      ${workpath}"
+    system "gnutar xvfz ${distpath}/${realname}-${vim_version}-lang.tar.gz -C \
+      ${workpath}"
+    system "gnutar xvfz ${distpath}/app-bm.tar.gz -C ${workpath}"
+    system "gnutar xvfz ${distpath}/doc.tar.gz -C ${workpath}"
+}
+
+test.run            yes
+
+destroot {
+    set appPath "/Applications/MacPorts/"
+    # create the required directories
+    xinstall -d -m 755 ${destroot}${appPath}Vim
+    # copy Vim.app
+    file copy ${worksrcpath}/src/Vim.app ${destroot}${appPath}Vim
+    xinstall -m 644 ${filespath}/vimrc ${filespath}/gvimrc \
+      ${destroot}${appPath}Vim/Vim.app
+    xinstall -m 644 ${workpath}/doc-txt.icns \
+      ${destroot}${appPath}Vim/Vim.app/Contents/Resources
+    xinstall -m 644 ${workpath}/app.icns \
+      ${destroot}${appPath}Vim/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"
+    file delete ${runtimePath}
+    file copy ${worksrcpath}/runtime ${runtimePath}
+    # fix permissions
+    foreach f [glob ${runtimePath}/autoload/*.vim] {
+            file attributes ${f} -permissions 0644
+    }
+    # install launchscript
+    xinstall -m 755 ${filespath}/gvim.sh \
+      ${destroot}/${prefix}/bin/gvim
+    # allow for Vim.App to open .nfo, .vim, .latex, .tex, .diff files
+    cd ${destroot}${appPath}Vim/Vim.app/Contents/
+    system "patch -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
+    }
+}
+
+variant big                     { configure.args-append --with-features=big }
+variant huge                    { configure.args-append --with-features=huge }
+variant multibyte               { configure.args-append --enable-multibyte }
+variant xim                     { configure.args-append --with-xim }
+
+variant perl {
+    configure.args-append   --enable-perlinterp
+    depends_lib-append      bin:perl:perl5.8
+}
+variant python {
+    configure.args-append   --enable-pythoninterp
+    depends_lib-append      bin:python:python23
+}
+variant ruby {
+    configure.args-append   --enable-rubyinterp
+    depends_lib-append      bin:ruby:ruby
+}
+variant tcl {
+    configure.args-append   --enable-tclinterp
+    depends_lib-append      bin:tclsh:tcl
+}
+
+variant cscope {
+    configure.args-append   --enable-cscope
+}
+
+platform darwin i386 {
+}
+
+include checksums_dist
+include checksums_patch


Property changes on: trunk/dports/editors/vim-app/Portfile
___________________________________________________________________
Name: svn:keywords
   + id
Name: svn:eol-style
   + native

Added: trunk/dports/editors/vim-app/files/GVim_app.tar.gz
===================================================================
(Binary files differ)


Property changes on: trunk/dports/editors/vim-app/files/GVim_app.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/dports/editors/vim-app/files/checksums_dist
===================================================================
--- trunk/dports/editors/vim-app/files/checksums_dist	                        (rev 0)
+++ trunk/dports/editors/vim-app/files/checksums_dist	2007-04-09 00:33:26 UTC (rev 23756)
@@ -0,0 +1,7 @@
+# $Id: dist_checksums,v 1.5 2006/06/23 19:44:38 mww Exp $
+checksums-append    vim-7.0.tar.bz2 sha1 38ef48cabf942d0dc804a794dcc6f002b9457fc8 \
+                    vim-7.0-extra.tar.gz sha1 101a3b82b26cd16ca48e2b4a5e4acfc6041abd1e \
+                    vim-7.0-lang.tar.gz sha1 3db6b0004d213490cc00d361835e7a7c685adb52 \
+                    app-bm.tar.gz md5 418b9e615a34ae5aad918f5c5a694a44 \
+                    doc.tar.gz md5 692f7874fc617162d0fe110daf39a98a
+

Added: trunk/dports/editors/vim-app/files/checksums_patch
===================================================================
--- trunk/dports/editors/vim-app/files/checksums_patch	                        (rev 0)
+++ trunk/dports/editors/vim-app/files/checksums_patch	2007-04-09 00:33:26 UTC (rev 23756)
@@ -0,0 +1,27 @@
+# $Id: patch_checksums,v 1.14 2006/06/23 19:44:38 mww Exp $
+checksums-append    7.0.001-100.gz sha1 cc3faa6722a70f1580438df7ddf498607e9e920f \
+                    7.0.101-200.gz sha1 b11087904f5c134804307f9667d2d065b0e3cde2 \
+                    7.0.201 sha1 1084e057dee8d9456e64e793752a4cab044d6a16 \
+                    7.0.202 sha1 1d4ceab21b5b85bcc9f619ed37fbd187a6b1ffaf \
+                    7.0.203 sha1 146d37a6e85d661c0285676617814fd049439b3c \
+                    7.0.204 sha1 f1f91b64b924a22597ff830b30faad5a41741a84 \
+                    7.0.205 sha1 1390c0fab6b8c3675ccec641e608bd643c062cc0 \
+                    7.0.206 sha1 eff2f6493bcaa08f0e695fd52d299b9fca20ac6f \
+                    7.0.207 sha1 6fea24959b4ed8e25e215d1e399615f08a00f38b \
+                    7.0.208 sha1 90a90d0cce6215a9fbef46af95b2fe9a3a033008 \
+                    7.0.209 sha1 9cb16a6da488399740bb3d2f15f2f1f3cddaeeb9 \
+                    7.0.210 sha1 e1c342652a513f012843beb70ffdf8529a875da5 \
+                    7.0.211 sha1 9d35c4b34cd9b579fe8e1f83e5cea90e49b95ab4 \
+                    7.0.212 sha1 909aa0249747e582133000aff767090a3ea74722 \
+                    7.0.213 sha1 94f78614e2eb16c3481aa6685ff3aeb56b4a072d \
+                    7.0.214 sha1 796bec6961160061ca31906ac1aa2c45a53cdd76 \
+                    7.0.215 sha1 f23069f545a01afe7e9a0d0d4c3f76f09cbf232b \
+                    7.0.216 sha1 3e2ac30244fcd5107a7e6a3dfa9ee6d05fd0ea31 \
+                    7.0.217 sha1 6435982d3bae43298c84c88fd85efd4eaeb1aef5 \
+                    7.0.218 sha1 a86638cc7109b499405ab66d8e4560242f7c2b0c \
+                    7.0.219 sha1 35fb1b1ce822e7cce31177e19df28a73cd5af618 \
+                    7.0.220 sha1 23e24d399f1befdaf719afe17dd0c75bf41a1c9a \
+                    7.0.221 sha1 70c58f7faeb2231b5898fe8c1cf7b583e84da725 \
+                    7.0.222 sha1 384d03ec2cf6487f0edf6871c238c2689889eed0 \
+                    7.0.223 sha1 c99ebb4069781179cd6ead445ac371129f585422 \
+                    7.0.224 sha1 3c9759df45b209cd1ccd2c520995f7c822a2b3b9

Added: trunk/dports/editors/vim-app/files/gvim.sh
===================================================================
--- trunk/dports/editors/vim-app/files/gvim.sh	                        (rev 0)
+++ trunk/dports/editors/vim-app/files/gvim.sh	2007-04-09 00:33:26 UTC (rev 23756)
@@ -0,0 +1,54 @@
+#!/bin/sh
+#
+# This shell script passes all its arguments to the binary inside the Vim.app
+# application bundle.  If you make links to this script as view, gvim, etc.,
+# then it will peek at the name used to call it and set options appropriately.
+#
+# Based on a script by Wout Mertens and suggestions from Laurent Bihanic.
+# This version is the fault of Benji Fisher, 16 May 2005.
+
+# First, check "All the Usual Suspects" for the location of the Vim.app bundle.
+# You can short-circuit this by setting the VIM_APP_DIR environment variable
+# or by un-commenting and editing the following line:
+# VIM_APP_DIR=/Applications
+
+binary="/Applications/MacPorts/Vim/Vim.app/Contents/MacOS/Vim"
+
+# Next, peek at the name used to invoke this script, and set options
+# accordingly.
+
+name="`basename "$0"`"
+gui=
+opts=
+
+# GUI mode, implies forking
+case "$name" in g*|rg*) gui=true ;; esac
+
+# Restricted mode
+case "$name" in r*) opts="$opts -Z";; esac
+
+# vimdiff and view
+case "$name" in
+	*vimdiff)
+		opts="$opts -dO"
+		;;
+	*view)
+		opts="$opts -R"
+		;;
+esac
+
+# Last step:  fire up vim.
+# GUI mode will always create a new Vim instance, because Vim can't have
+# more than one graphic window yet.
+# The program should fork by default when started in GUI mode, but it does
+# not; we work around this when this script is invoked as "gvim" or "rgview"
+# etc., but not when it is invoked as "vim -g".
+if [ "$gui" ]; then
+	# Note: this isn't perfect, because any error output goes to the
+	# terminal instead of the console log.
+	# But if you use open instead, you will need to fully qualify the
+	# path names for any filenames you specify, which is hard.
+	exec "$binary" -g $opts ${1:+"$@"} &
+else
+	exec "$binary" $opts ${1:+"$@"}
+fi

Added: trunk/dports/editors/vim-app/files/gvimrc
===================================================================
--- trunk/dports/editors/vim-app/files/gvimrc	                        (rev 0)
+++ trunk/dports/editors/vim-app/files/gvimrc	2007-04-09 00:33:26 UTC (rev 23756)
@@ -0,0 +1,200 @@
+" System gvimrc file for Mac OS X
+" Author:  Benji Fisher <benji at member.AMS.org>
+" Last modified:  10 February 2003
+
+" If you want to get more Mac-like behavior, leave the "finish" line
+" commented out.  For vim-standard menus, uncomment this line so that the rest
+" of the file will be ignored.
+
+" finish
+
+" TODO:  Decide whether to leave it in non-compatible mode.
+" For now, save and restore.
+let s:save_cpo = &cpo
+set cpo&vim
+
+" Define mac-standard menu items and keyboard shortcuts.
+
+aunmenu &File.&New
+amenu 10.325 &File.&New<Tab><D-n> <D-n>
+nmap <D-n> :confirm enew<CR>
+vmap <D-n> <Esc><D-n>gv
+imap <D-n> <C-O><D-n>
+cmap <D-n> <C-C><D-n>
+omap <D-n> <Esc><D-n>
+aunmenu &File.&Open\.\.\.
+amenu 10.310 &File.&Open\.\.\.<Tab><D-o> <D-o>
+nmap <D-o> :browse confirm e<CR>
+vmap <D-o> <Esc><D-o>gv
+imap <D-o> <C-O><D-o>
+cmap <D-o> <C-C><D-o>
+omap <D-o> <Esc><D-o>
+aunmenu &File.&Close
+amenu 10.330 &File.&Close<Tab><D-w> <D-w>
+nmap <silent> <D-w> :if winheight(2) < 0 <Bar>
+	\   confirm enew <Bar>
+	\ else <Bar>
+	\   confirm close <Bar>
+	\ endif<CR>
+vmap <D-w> <Esc><D-w>gv
+imap <D-w> <C-O><D-w>
+cmap <D-w> <C-C><D-w>
+omap <D-w> <Esc><D-w>
+aunmenu &File.&Save
+amenu 10.340 &File.&Save<Tab><D-s> <D-s>
+nmap <silent> <D-s> :if expand("%") == ""<Bar>browse confirm w<Bar>
+	\ else<Bar>confirm w<Bar>endif<CR>
+vmap <D-s> <Esc><D-s>gv
+imap <D-s> <C-O><D-s>
+cmap <D-s> <C-C><D-s>
+omap <D-s> <Esc><D-s>
+aunmenu &File.Save\ &As\.\.\.
+amenu 10.350 &File.Save\ &As\.\.\.<Tab><D-S>	<D-S-s>
+nmap <D-S-s> :browse confirm saveas<CR>
+vmap <D-S-s> <Esc><D-s>gv
+imap <D-S-s> <C-O><D-s>
+cmap <D-S-s> <C-C><D-s>
+omap <D-S-s> <Esc><D-s>
+" map <D-p> ??
+" <D-q> is handled by the OS.
+"amenu File.Quit<Tab><D-q> <D-q>
+"nmap <D-q> :confirm qall<CR>
+"vmap <D-q> <Esc><D-q>gv
+"imap <D-q> <C-O><D-q>
+"cmap <D-q> <C-C><D-q>
+"omap <D-q> <Esc><D-q>
+" From the Edit menu of SimpleText:
+aunmenu &Edit.&Undo
+amenu 20.310 &Edit.&Undo<Tab><D-z> <D-z>
+nmap <D-z> u
+vmap <D-z> <Esc><D-z>gv
+imap <D-z> <C-O><D-z>
+cmap <D-z> <C-C><D-z>
+omap <D-z> <Esc><D-z>
+vunmenu &Edit.Cu&t
+vmenu 20.340 &Edit.Cu&t<Tab><D-x> <D-x>
+vmap <D-x> "+x
+vunmenu &Edit.&Copy
+vmenu 20.350 &Edit.&Copy<Tab><D-c> <D-c>
+vmap <D-c> "+y
+cunmenu &Edit.&Copy
+cmenu 20.350 &Edit.&Copy<Tab><D-c> <D-c>
+cmap <D-c> <C-Y>
+aunmenu &Edit.&Paste
+nmenu 20.360 &Edit.&Paste<Tab><D-v> <D-v>
+nmap <D-v> "+gP
+cmenu	     &Edit.&Paste<Tab><D-v> <D-v>
+cmap <D-v> <C-R>+
+vmenu	     &Edit.&Paste<Tab><D-v> <D-v>
+imenu	     &Edit.&Paste<Tab><D-v> <D-v>
+if has("virtualedit")
+  vmap <D-v> "-c<Esc><SID>Paste
+  imap <D-v> <Esc><SID>Pastegi
+else
+  vmap <D-v> "-c<Esc>gix<Esc><SID>Paste"_x
+  imap <D-v> x<Esc><SID>Paste"_s
+endif
+aunmenu &Edit.&Select\ All
+amenu 20.400 &Edit.Select\ &All<Tab><D-a>	<D-a>
+nmap <silent> <D-a> :if &slm != ""<Bar>exe ":norm gggH<C-O>G"<Bar>
+	\ else<Bar>exe ":norm ggVG"<Bar>endif<CR>
+vmap <D-a> <Esc><D-a>
+imap <D-a> <Esc><D-a>
+cmap <D-a> <C-C><D-a>
+omap <D-a> <Esc><D-a>
+aunmenu &Edit.&Find
+amenu 20.410 &Edit.&Find<Tab><D-f>	<D-f>
+nmap <D-f> /
+vmap <D-f> <Esc><D-f>
+imap <D-f> <Esc><D-f>
+cmap <D-f> <C-C><D-f>
+omap <D-f> <Esc><D-f>
+amenu 20.420 &Edit.&Next<Tab><D-g>	<D-g>
+nmap <D-g> n
+vmap <D-g> <Esc><D-g>
+imap <D-g> <C-O><D-g>
+cmap <D-g> <C-C><D-g>
+omap <D-g> <Esc><D-g>
+vmenu <silent> 20.420 &Edit.Find\ &Selection "9y/<C-R>9<CR>
+	\:if strlen(@9) > 1 <Bar>
+	\ exe 'norm!v/' . @9 . '/e' . "<Bslash><lt>CR>"<Bar>
+	\ else <Bar> exe "norm!v" <Bar> endif<CR>
+
+" Copied from $VIMRUNTIME/menu.vim:
+" Pasting blockwise and linewise selections is not possible in Insert and
+" Visual mode without the +virtualedit feature.  They are pasted as if they
+" were characterwise instead.  Add to that some tricks to leave the cursor in
+" the right position, also for "gi".
+if has("virtualedit")
+  nnoremap <silent> <script> <SID>Paste :call <SID>Paste()<CR>
+  func! <SID>Paste()
+    let ove = &ve
+    set ve=all
+    normal `^
+    if @+ != ''
+      normal "+gP
+    endif
+    let c = col(".")
+    normal i
+    if col(".") < c	" compensate for i<ESC> moving the cursor left
+      normal l
+    endif
+    let &ve = ove
+  endfunc
+else
+  nnoremap <silent> <script> <SID>Paste "=@+.'xy'<CR>gPFx"_2x
+endif
+
+" Add a Preferences... menu item to the Edit menu.
+amenu Edit.-SepPrefs- :
+amenu Edit.Preferences\.\.\. :call <SID>Preferences()<CR>
+
+fun! <SID>Preferences()
+	let prompt = "Choose one of the following:"
+	let prompt = prompt . "\r1 Set options for the current session."
+	let prompt = prompt . "\r2 Edit ~/.vimrc for future sessions."
+	let prompt = prompt . "\r3 Do 1 and 2, in split windows."
+	let prompt = prompt . "\r4 Edit ~/.gvimrc for future sessions."
+	let response = inputdialog(prompt, "1")
+	if response == 1
+		options
+	elseif response == 2
+		call s:EditVimrc("vimrc")
+	elseif response == 3
+		call s:EditVimrc()
+		options
+	elseif response == 4
+		call s:EditVimrc("gvimrc")
+	else
+		echohl WarningMsg
+		echo "Sorry:  1 or 2 or 3 or 4 expected."
+		echohl None
+	endif
+endfun
+
+fun! s:EditVimrc(rcfile)
+	if filewritable($HOME . "/." . a:rcfile)
+		let vimrc = $HOME . "/." . a:rcfile
+	elseif filewritable($HOME . "/_" . a:rcfile)
+		let vimrc = $HOME . "/_" . a:rcfile
+	else
+		let prompt = "Create a vimrc file in your home directory:"
+		let prompt = prompt . "\r." . a:rcfile . " is the Vim standard."
+		let prompt = prompt . "\r_" . a:rcfile . " is visible from Finder."
+		let prompt = prompt . "\rLeave blank to cancel:"
+		let vimrc = inputdialog(prompt, "." . a:rcfile)
+		if vimrc == ""
+			return
+		endif
+		let vimrc = $HOME . "/" . vimrc
+		let prompt = "Start with " a:rcfile . "_example.vim ?"
+		let template = inputdialog(prompt, "Yes")
+	endif
+	execute "split" vimrc
+	if exists("template") && template ==? "Yes"
+		execute "read" $VIMRUNTIME . "/" . a:rcfile . "_example.vim"
+		0put='\" Copied from $VIMRUNTIME/' . a:rcfile . '_example.vim'
+	endif
+endfun
+
+let &cpo = s:save_cpo

Added: trunk/dports/editors/vim-app/files/patch-Info.plist
===================================================================
--- trunk/dports/editors/vim-app/files/patch-Info.plist	                        (rev 0)
+++ trunk/dports/editors/vim-app/files/patch-Info.plist	2007-04-09 00:33:26 UTC (rev 23756)
@@ -0,0 +1,14 @@
+--- Info.plist	2007-03-03 19:46:34.000000000 +0100
++++ /Users/pipping/macports-trunk/dports/editors/vim/files//patch-Info.plist	2007-03-03 19:52:37.000000000 +0100
+@@ -36,6 +36,11 @@
+ 				<array>
+ 					<string>txt</string>
+ 					<string>text</string>
++					<string>nfo</string>
++					<string>vim</string>
++					<string>latex</string>
++					<string>tex</string>
++					<string>diff</string>
+ 				</array>
+ 				<key>CFBundleTypeMIMETypes</key>
+ 				<array>

Added: trunk/dports/editors/vim-app/files/patch-if_ruby.c
===================================================================
--- trunk/dports/editors/vim-app/files/patch-if_ruby.c	                        (rev 0)
+++ trunk/dports/editors/vim-app/files/patch-if_ruby.c	2007-04-09 00:33:26 UTC (rev 23756)
@@ -0,0 +1,11 @@
+--- src/if_ruby.c.orig	2006-12-14 16:14:39.000000000 -0500
++++ src/if_ruby.c	2006-12-14 16:14:55.000000000 -0500
+@@ -54,7 +54,7 @@
+ #undef _
+ 
+ /* T_DATA defined both by Ruby and Mac header files, hack around it... */
+-#ifdef FEAT_GUI_MAC
++#ifdef MACOS_X_UNIX		/* was FEAT_GUI_MAC */
+ # define __OPENTRANSPORT__
+ # define __OPENTRANSPORTPROTOCOL__
+ # define __OPENTRANSPORTPROVIDERS__

Added: trunk/dports/editors/vim-app/files/vimrc
===================================================================
--- trunk/dports/editors/vim-app/files/vimrc	                        (rev 0)
+++ trunk/dports/editors/vim-app/files/vimrc	2007-04-09 00:33:26 UTC (rev 23756)
@@ -0,0 +1,21 @@
+" System vimrc file for Mac OS X
+" Author:  Benji Fisher <benji at member.AMS.org>
+" Last modified:  23 February 2004
+
+" TODO:  Is there any way to test whether Vim.app was started from the Finder? 
+if has("gui_running")
+  " Get the value of $PATH from a login shell.
+  " If your shell is not on this list, it may be just because we have not
+  " tested it.  Try adding it to the list and see if it works.  If so,
+  " please post a note to the vim-mac list!
+  if $SHELL =~ '/\(sh\|csh\|bash\|tcsh\|zsh\)$'
+    let s:path = system("echo echo VIMPATH'${PATH}' | $SHELL -l")
+    let $PATH = matchstr(s:path, 'VIMPATH\zs.\{-}\ze\n')
+  endif
+  " Change directory on startup.
+  autocmd VimEnter * if getcwd()=="/" | if strlen(@%) | cd %:p:h | else | cd | endif | endif
+" If running in a Terminal window, set the terminal type to allow syntax
+" highlighting.
+" else
+"   set term=ansi
+endif

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


More information about the macports-changes mailing list