[72227] trunk/dports/editors

[raimue at macports.org]

Revision: 72227
          http://trac.macports.org/changeset/72227
Author:   raimue at macports.org
Date:     2010-10-07 17:18:55 -0700 (Thu, 07 Oct 2010)
Log Message:
-----------
editors/vim, editors/vim-app:
Fix build failure with +x11 variant, #26744

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

Added Paths:
-----------
    trunk/dports/editors/vim/files/patch-x11.diff
    trunk/dports/editors/vim-app/files/patch-x11.diff

Modified: trunk/dports/editors/vim/Portfile
===================================================================
--- trunk/dports/editors/vim/Portfile	2010-10-07 22:54:36 UTC (rev 72226)
+++ trunk/dports/editors/vim/Portfile	2010-10-08 00:18:55 UTC (rev 72227)
@@ -6,7 +6,7 @@
 set vim_version     7.3
 set vim_patchlevel  11
 version             ${vim_version}.${vim_patchlevel}
-revision            1
+revision            2
 categories          editors
 maintainers         raimue
 description         Vi \"workalike\" with many additional features
@@ -24,6 +24,8 @@
 dist_subdir         vim[strsed ${vim_version} {g/\.//}]
 worksrcdir          vim[strsed ${vim_version} {g/\.//}]
 
+# patchfiles-append   patch-x11.diff
+
 # Generate patchfiles
 set low 1
 set patchlevel [string trimleft $vim_patchlevel 0]

Added: trunk/dports/editors/vim/files/patch-x11.diff
===================================================================
--- trunk/dports/editors/vim/files/patch-x11.diff	                        (rev 0)
+++ trunk/dports/editors/vim/files/patch-x11.diff	2010-10-08 00:18:55 UTC (rev 72227)
@@ -0,0 +1,10 @@
+--- src/os_macosx.m.orig	2010-10-08 01:53:04.000000000 +0200
++++ src/os_macosx.m	2010-10-08 01:53:18.000000000 +0200
+@@ -15,6 +15,7 @@
+     Error: MACOS 9 is no longer supported in Vim 7
+ #endif
+ 
++#define NO_X11_INCLUDES
+ #include "vim.h"
+ #import <Cocoa/Cocoa.h>
+ 

Modified: trunk/dports/editors/vim-app/Portfile
===================================================================
--- trunk/dports/editors/vim-app/Portfile	2010-10-07 22:54:36 UTC (rev 72226)
+++ trunk/dports/editors/vim-app/Portfile	2010-10-08 00:18:55 UTC (rev 72227)
@@ -7,7 +7,7 @@
 set vim_version     7.3
 set vim_patchlevel  11
 version             ${vim_version}.${vim_patchlevel}
-revision            1
+revision            2
 categories          editors
 maintainers         raimue
 description         Vim.app is a GUI version of the famous editor vim.
@@ -28,6 +28,8 @@
 dist_subdir         vim[strsed ${vim_version} {g/\.//}]
 worksrcdir          vim[strsed ${vim_version} {g/\.//}]
 
+patchfiles-append   patch-x11.diff
+
 # Generate patchfiles
 set low 1
 set patchlevel [string trimleft $vim_patchlevel 0]

Added: trunk/dports/editors/vim-app/files/patch-x11.diff
===================================================================
--- trunk/dports/editors/vim-app/files/patch-x11.diff	                        (rev 0)
+++ trunk/dports/editors/vim-app/files/patch-x11.diff	2010-10-08 00:18:55 UTC (rev 72227)
@@ -0,0 +1,10 @@
+--- src/os_macosx.m.orig	2010-10-08 01:53:04.000000000 +0200
++++ src/os_macosx.m	2010-10-08 01:53:18.000000000 +0200
+@@ -15,6 +15,7 @@
+     Error: MACOS 9 is no longer supported in Vim 7
+ #endif
+ 
++#define NO_X11_INCLUDES
+ #include "vim.h"
+ #import <Cocoa/Cocoa.h>
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101007/bd78af48/attachment.html>