[49486] trunk/dports/editors/MacVim

[raimue at macports.org]

Revision: 49486
          http://trac.macports.org/changeset/49486
Author:   raimue at macports.org
Date:     2009-04-10 17:13:21 -0700 (Fri, 10 Apr 2009)
Log Message:
-----------
editors/MacVim:
Instead of patching the configure script directly, patch configure.in and run
autoconf. See also r49481.
Strip src/ from worksrcdir as it allows unmodified use of patches applied to vim.

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

Added Paths:
-----------
    trunk/dports/editors/MacVim/files/patch-x-includes.diff

Removed Paths:
-------------
    trunk/dports/editors/MacVim/files/patch-configure.diff

Modified: trunk/dports/editors/MacVim/Portfile
===================================================================
--- trunk/dports/editors/MacVim/Portfile	2009-04-11 00:06:04 UTC (rev 49485)
+++ trunk/dports/editors/MacVim/Portfile	2009-04-11 00:13:21 UTC (rev 49486)
@@ -21,16 +21,21 @@
                     sha1    ea77f47d098017357e3e3d2c7aee9e498e6751a8 \
                     rmd160  63ac0431d43ce6c72b6ec53b7c032b0d60c1ff16
 use_zip             yes
-worksrcdir          MacVim/src
+worksrcdir          ${name}
 
 depends_build       bin:gnutar:gnutar \
-                    bin:grep:grep
+                    bin:grep:grep \
+                    bin:autoconf:autoconf
 depends_lib         port:ncurses \
                     port:libiconv \
                     port:ctags
 
-patchfiles          patch-configure.diff
+patchfiles          patch-x-includes.diff
 
+pre-configure {
+    system "cd ${worksrcpath}/src && autoconf"
+}
+
 configure.args      --enable-gui=macvim \
                     --without-x \
                     --disable-gpm \
@@ -42,11 +47,12 @@
 
 post-patch {
     reinplace "s|^# VIM_APP_DIR=/Applications$|VIM_APP_DIR=${applications_dir}|" \
-         ${worksrcpath}/MacVim/mvim
+         ${worksrcpath}/src/MacVim/mvim
 }
 
+build.dir ${worksrcpath}/src
 post-build {
-    system "cd ${worksrcpath}/MacVim && xcodebuild"
+    system "cd ${worksrcpath}/src/MacVim && xcodebuild"
 }
 
 # Can be removed once MacPorts 1.7.1 is released
@@ -55,8 +61,8 @@
 }
 
 destroot {
-    copy ${worksrcpath}/MacVim/build/Release/MacVim.app ${destroot}${applications_dir}
-    copy ${worksrcpath}/MacVim/mvim ${destroot}${prefix}/bin
+    copy ${worksrcpath}/src/MacVim/build/Release/MacVim.app ${destroot}${applications_dir}
+    copy ${worksrcpath}/src/MacVim/mvim ${destroot}${prefix}/bin
 }
 
 test.run            yes

Deleted: trunk/dports/editors/MacVim/files/patch-configure.diff
===================================================================
--- trunk/dports/editors/MacVim/files/patch-configure.diff	2009-04-11 00:06:04 UTC (rev 49485)
+++ trunk/dports/editors/MacVim/files/patch-configure.diff	2009-04-11 00:13:21 UTC (rev 49486)
@@ -1,11 +0,0 @@
---- configure.orig	2008-07-24 06:40:36.000000000 -0600
-+++ configure	2009-01-18 21:15:03.000000000 -0700
-@@ -15458,7 +15458,7 @@
- if test "$enable_multibyte" = "yes"; then
-   cflags_save=$CFLAGS
-   ldflags_save=$LDFLAGS
--  if test -n "$x_includes" ; then
-+  if test -n "$x_includes" && test "$x_includes" != "NONE"; then
-     CFLAGS="$CFLAGS -I$x_includes"
-     LDFLAGS="$X_LIBS $LDFLAGS -lX11"
-     { $as_echo "$as_me:$LINENO: checking whether X_LOCALE needed" >&5

Added: trunk/dports/editors/MacVim/files/patch-x-includes.diff
===================================================================
--- trunk/dports/editors/MacVim/files/patch-x-includes.diff	                        (rev 0)
+++ trunk/dports/editors/MacVim/files/patch-x-includes.diff	2009-04-11 00:13:21 UTC (rev 49486)
@@ -0,0 +1,11 @@
+--- src/configure.in.old	2009-04-11 00:05:39.000000000 +0200
++++ src/configure.in	2009-04-11 00:06:09.000000000 +0200
+@@ -2952,7 +2952,7 @@
+ if test "$enable_multibyte" = "yes"; then
+   cflags_save=$CFLAGS
+   ldflags_save=$LDFLAGS
+-  if test -n "$x_includes" ; then
++  if test -n "$x_includes" && test "$x_includes" != "NONE"; then
+     CFLAGS="$CFLAGS -I$x_includes"
+     LDFLAGS="$X_LIBS $LDFLAGS -lX11"
+     AC_MSG_CHECKING(whether X_LOCALE needed)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090410/0e6b881f/attachment.html>