[82549] trunk/dports/devel/cvs/Portfile

dports at macports.org dports at macports.org
Mon Aug 15 10:04:45 PDT 2011


Revision: 82549
          http://trac.macports.org/changeset/82549
Author:   dports at macports.org
Date:     2011-08-15 10:04:43 -0700 (Mon, 15 Aug 2011)
Log Message:
-----------
cvs: fix build on both Lion *and* Snow Leopard this time: apply
patch to rename getline only on Lion (#30785; see also #30378/r82092)

Revision Links:
--------------
    http://trac.macports.org/changeset/82092

Modified Paths:
--------------
    trunk/dports/devel/cvs/Portfile

Modified: trunk/dports/devel/cvs/Portfile
===================================================================
--- trunk/dports/devel/cvs/Portfile	2011-08-15 16:56:03 UTC (rev 82548)
+++ trunk/dports/devel/cvs/Portfile	2011-08-15 17:04:43 UTC (rev 82549)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 # $Id$
 
 PortSystem      1.0
@@ -21,8 +22,13 @@
                 sha1    a51c531eebaff2dfdcc0fb6d94c8c6e509e06d7d \
                 rmd160  ff8c5c6777f1c12ee9134a3cf59e00c2ebaad279
 
-patchfiles      patch-getline
 
+# Lion provides a POSIX getline; rename the one in the source to use
+# the OS-provided one instead, and avoid conflict on name
+if {${os.platform} == "darwin" && ${os.major} >= 11} {
+    patchfiles-append      patch-getline
+}
+
 configure.args  --infodir=${prefix}/share/info \
                 --mandir=${prefix}/share/man
 configure.env   TMPDIR= TMP= TEMP= 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110815/d6570ea6/attachment.html>


More information about the macports-changes mailing list