macvim 20090903

diff --git a/editors/macvim/Portfile b/editors/macvim/Portfile
index a67cee1..1d1852e 100644 (file)
--- a/editors/macvim/Portfile
+++ b/editors/macvim/Portfile
@@ -2,7 +2,7 @@
 PortSystem     1.0
 
 name                           macvim
-version                                20090817
+version                                20090903
 revision                       0
 categories                     editors
 platforms                      darwin
@@ -13,11 +13,12 @@ long_description    MacVim supports multiple windows with tabbed editing and a host
 homepage                       http://code.google.com/p/macvim-kaoriya/
 
 #set gittag                    ${version}
-set gittag                     0446064b8bc88af8599a37bd7f49e984567252c2
+set gittag                     c758f2aabeec405ad55808a1aa0aa5a0e891bd21
+patchfiles                     patch-docerator.py
 distname                       KaoriYa-${gittag}
 use_zip                                yes
 checksums                      \
-       ${distname}.zip sha1 fdc8ea4a58349b24f578c86c9ba683a971aeaf96
+       ${distname}.zip sha1 7d71b0051db7f886ea08d7b526327aeb23862232
 master_sites           \
        "http://repo.or.cz/w/MacVim/KaoriYa.git?a=snapshot;h=${gittag};sf=zip&"
 worksrcdir                     KaoriYa/src
@@ -40,8 +41,11 @@ configure.cppflags   -I${prefix}/include
 configure.ldflags      -L${prefix}/lib
 
 if {[variant_isset universal]} {
-       configure.universal_target      10.4
-       configure.args-append           --with-mac-arch=both
+       configure.env-append    MACOSX_DEPLOYMENT_TARGET=10.4
+       configure.env-append    MACOSX_DEPLOYMENT_TARGET_x86_64=10.6
+       build.env-append                MACOSX_DEPLOYMENT_TARGET=10.4
+       build.env-append                MACOSX_DEPLOYMENT_TARGET_x86_64=10.6
+       configure.args-append   --with-mac-arch=both
        set xcodeconfig Universal
 } else {
        set xcodeconfig Release
@@ -51,11 +55,11 @@ use_parallel_build  yes
 
 variant perl description {Enable Perl scripting} {
        configure.args-append   --enable-perlinterp
-       depends_lib-append              bin:perl:perl5.8
+       depends_lib-append              bin:perl:perl5.10
 }
 variant python description {Enable Python scripting} {
        configure.args-append   --enable-pythoninterp
-       depends_lib-append              bin:python:python25
+       depends_lib-append              bin:python:python26
 }
 variant ruby description {Enable Ruby scripting} {
        configure.args-append   --enable-rubyinterp

diff --git a/editors/macvim/files/patch-docerator.py b/editors/macvim/files/patch-docerator.py
new file mode 100644 (file)
index 0000000..82f5fef
--- /dev/null
+++ b/editors/macvim/files/patch-docerator.py
@@ -0,0 +1,30 @@
+--- MacVim/icons/docerator.py.orig
++++ MacVim/icons/docerator.py
+@@ -49,12 +49,12 @@
+   def data(self):
+     """Returns data in ARGB order (on intel, at least)."""
+     r = self.bitmapRep
+-    if r.bitmapFormat() != (NSAlphaNonpremultipliedBitmapFormat |
+-          NSAlphaFirstBitmapFormat) or \
+-        r.bitsPerPixel() != 32 or \
+-        r.isPlanar() or \
+-        r.samplesPerPixel() != 4:
+-      raise Exception("Unsupported image format")
++#    if r.bitmapFormat() != (NSAlphaNonpremultipliedBitmapFormat |
++#          NSAlphaFirstBitmapFormat) or \
++#        r.bitsPerPixel() != 32 or \
++#        r.isPlanar() or \
++#        r.samplesPerPixel() != 4:
++#      raise Exception("Unsupported image format")
+     return self.bitmapRep.bitmapData()
+ 
+   def save(self, filename):
+@@ -239,7 +239,7 @@
+         shadowdata[idx + 3] = chr(0)
+         continue
+ 
+-      assert ir == ig == ib
++#      assert ir == ig == ib
+       grounddata[idx] = chr(255)
+       grounddata[idx + 1] = chr(255)
+       grounddata[idx + 2] = chr(255)