[78059] trunk/dports/editors/MacVim

[raimue at macports.org]

Revision: 78059
          http://trac.macports.org/changeset/78059
Author:   raimue at macports.org
Date:     2011-04-21 07:03:18 -0700 (Thu, 21 Apr 2011)
Log Message:
-----------
editors/MacVim:
Use our own python port as build dependency.
Avoids build problems with Xcode 4, fixes #29100
No revision bumped as installed files have not been changed.

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

Added Paths:
-----------
    trunk/dports/editors/MacVim/files/patch-src-MacVim-icons-font-url.diff
    trunk/dports/editors/MacVim/files/patch-src-MacVim-icons-python.diff

Removed Paths:
-------------
    trunk/dports/editors/MacVim/files/patch-src-MacVim-icons-Makefile.diff

Modified: trunk/dports/editors/MacVim/Portfile
===================================================================
--- trunk/dports/editors/MacVim/Portfile	2011-04-21 13:55:37 UTC (rev 78058)
+++ trunk/dports/editors/MacVim/Portfile	2011-04-21 14:03:18 UTC (rev 78059)
@@ -25,12 +25,14 @@
 
 depends_build       bin:gnutar:gnutar \
                     bin:grep:grep \
-                    bin:autoconf:autoconf
+                    bin:autoconf:autoconf \
+                    port:python27
 depends_lib         port:ncurses \
                     port:libiconv \
                     port:ctags
 
-patchfiles          patch-src-MacVim-icons-Makefile.diff
+patchfiles          patch-src-MacVim-icons-font-url.diff \
+                    patch-src-MacVim-icons-python.diff
 
 pre-fetch {
     if {${os.platform} == "darwin" && ${os.major} < 10} {
@@ -62,7 +64,8 @@
                     --enable-multibyte
 
 # Old pre-compiled headers could influence build, #26723
-build.args          XCODEFLAGS="CACHE_ROOT=${workpath}/caches"
+build.args          XCODEFLAGS="CACHE_ROOT=${workpath}/caches" \
+                    PYTHON=${prefix}/bin/python2.7
 
 destroot {
     copy ${worksrcpath}/src/MacVim/build/Release/MacVim.app ${destroot}${applications_dir}

Deleted: trunk/dports/editors/MacVim/files/patch-src-MacVim-icons-Makefile.diff
===================================================================
--- trunk/dports/editors/MacVim/files/patch-src-MacVim-icons-Makefile.diff	2011-04-21 13:55:37 UTC (rev 78058)
+++ trunk/dports/editors/MacVim/files/patch-src-MacVim-icons-Makefile.diff	2011-04-21 14:03:18 UTC (rev 78059)
@@ -1,11 +0,0 @@
---- src/MacVim/icons/Makefile.orig	2011-01-29 06:49:40.000000000 -0500
-+++ src/MacVim/icons/Makefile	2011-02-24 13:34:37.000000000 -0500
-@@ -15,7 +15,7 @@
- 	# "now", so that the zip is not unzipped in every `make` run.`
- 	touch Envy\ Code\ R\ Bold.ttf
- 
--ENVYCODE_URL=http://download.damieng.com/latest/EnvyCodeR
-+ENVYCODE_URL=http://download.damieng.com/fonts/original/EnvyCodeR-PR7.zip
- EnvyCodeR.zip:
- 	curl ${ENVYCODE_URL} --location -o EnvyCodeR.zip
- 

Copied: trunk/dports/editors/MacVim/files/patch-src-MacVim-icons-font-url.diff (from rev 78056, trunk/dports/editors/MacVim/files/patch-src-MacVim-icons-Makefile.diff)
===================================================================
--- trunk/dports/editors/MacVim/files/patch-src-MacVim-icons-font-url.diff	                        (rev 0)
+++ trunk/dports/editors/MacVim/files/patch-src-MacVim-icons-font-url.diff	2011-04-21 14:03:18 UTC (rev 78059)
@@ -0,0 +1,11 @@
+--- src/MacVim/icons/Makefile.orig	2011-01-29 06:49:40.000000000 -0500
++++ src/MacVim/icons/Makefile	2011-02-24 13:34:37.000000000 -0500
+@@ -15,7 +15,7 @@
+ 	# "now", so that the zip is not unzipped in every `make` run.`
+ 	touch Envy\ Code\ R\ Bold.ttf
+ 
+-ENVYCODE_URL=http://download.damieng.com/latest/EnvyCodeR
++ENVYCODE_URL=http://download.damieng.com/fonts/original/EnvyCodeR-PR7.zip
+ EnvyCodeR.zip:
+ 	curl ${ENVYCODE_URL} --location -o EnvyCodeR.zip
+ 

Added: trunk/dports/editors/MacVim/files/patch-src-MacVim-icons-python.diff
===================================================================
--- trunk/dports/editors/MacVim/files/patch-src-MacVim-icons-python.diff	                        (rev 0)
+++ trunk/dports/editors/MacVim/files/patch-src-MacVim-icons-python.diff	2011-04-21 14:03:18 UTC (rev 78059)
@@ -0,0 +1,19 @@
+--- src/MacVim/icons/Makefile.orig	2011-04-21 15:50:55.000000000 +0200
++++ src/MacVim/icons/Makefile	2011-04-21 15:51:13.000000000 +0200
+@@ -1,13 +1,14 @@
+ .PHONY: clean
+ 
++PYTHON ?= /usr/bin/python
+ OUTDIR ?= .
+ 
+ $(OUTDIR)/MacVim-generic.icns: make_icons.py vim-noshadow-512.png loadfont.so Envy\ Code\ R\ Bold.ttf
+ 	$(MAKE) -C makeicns
+-	/usr/bin/python make_icons.py $(OUTDIR)
++	$(PYTHON) make_icons.py $(OUTDIR)
+ 
+ loadfont.so: loadfont.c
+-	/usr/bin/python setup.py install --install-lib .
++	$(PYTHON) setup.py install --install-lib .
+ 
+ Envy\ Code\ R\ Bold.ttf: EnvyCodeR.zip
+ 	unzip -jo EnvyCodeR.zip
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110421/2a0b8663/attachment.html>