[111963] trunk/dports/editors

[raimue at macports.org]

Revision: 111963
          https://trac.macports.org/changeset/111963
Author:   raimue at macports.org
Date:     2013-10-06 15:03:17 -0700 (Sun, 06 Oct 2013)
Log Message:
-----------
editors/vim, editors/vim-app:
Fix use of the wrong compiler after applying patches to the configure script.

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

Modified: trunk/dports/editors/vim/Portfile
===================================================================
--- trunk/dports/editors/vim/Portfile	2013-10-06 21:42:38 UTC (rev 111962)
+++ trunk/dports/editors/vim/Portfile	2013-10-06 22:03:17 UTC (rev 111963)
@@ -103,6 +103,18 @@
 autoconf.args
 autoconf.dir ${worksrcpath}/src
 
+post-patch {
+    set features [open ${worksrcpath}/src/feature.h a+]
+    puts $features "#define SYS_VIMRC_FILE \"${prefix}/etc/vimrc\""
+    close $features
+
+    # Ensure that auto/config.mk is never older than auto/configure.
+    # If the latter was modified by a patch, it would trigger a rebuild of
+    # auto/config.mk with the wrong environment resulting in the use of the
+    # wrong compiler.
+    file mtime ${worksrcpath}/src/auto/config.mk [clock seconds]
+}
+
 configure.args      --disable-gui \
                     --without-x \
                     --disable-gpm \
@@ -111,12 +123,6 @@
                     --enable-multibyte \
                     --with-developer-dir=${developer_dir}
 
-post-patch {
-    set features [open ${worksrcpath}/src/feature.h a+]
-    puts $features "#define SYS_VIMRC_FILE \"${prefix}/etc/vimrc\""
-    close $features
-}
-
 post-destroot {
     ln -s ${prefix}/bin/vim ${destroot}${prefix}/bin/vi
 }

Modified: trunk/dports/editors/vim-app/Portfile
===================================================================
--- trunk/dports/editors/vim-app/Portfile	2013-10-06 21:42:38 UTC (rev 111962)
+++ trunk/dports/editors/vim-app/Portfile	2013-10-06 22:03:17 UTC (rev 111963)
@@ -125,6 +125,18 @@
 autoconf.args
 autoconf.dir ${worksrcpath}/src
 
+post-patch {
+    set features [open ${worksrcpath}/src/feature.h a+]
+    puts $features "#define SYS_VIMRC_FILE \"${prefix}/etc/vimrc\""
+    close $features
+
+    # Ensure that auto/config.mk is never older than auto/configure.
+    # If the latter was modified by a patch, it would trigger a rebuild of
+    # auto/config.mk with the wrong environment resulting in the use of the
+    # wrong compiler.
+    file mtime ${worksrcpath}/src/auto/config.mk [clock seconds]
+}
+
 configure.pre_args  --prefix=${applications_dir}
 configure.args      --enable-gui=carbon \
                     --without-x \
@@ -140,12 +152,6 @@
     system "tar xvfz ${distpath}/doc.tar.gz -C ${workpath}"
 }
 
-post-patch {
-	set features [open ${worksrcpath}/src/feature.h a+]
-	puts $features "#define SYS_VIMRC_FILE \"${prefix}/etc/vimrc\""
-	close $features
-}
-
 test.run            yes
 
 pre-destroot {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131006/eab083e3/attachment.html>