[109123] branches/subversion-subports/dports/devel/subversion/Portfile

[larryv at macports.org]

Revision: 109123
          https://trac.macports.org/changeset/109123
Author:   larryv at macports.org
Date:     2013-08-08 00:38:32 -0700 (Thu, 08 Aug 2013)
Log Message:
-----------
[subversion-subports] subversion: Replace +disable_keychain with -osxkeychain.

Modified Paths:
--------------
    branches/subversion-subports/dports/devel/subversion/Portfile

Modified: branches/subversion-subports/dports/devel/subversion/Portfile
===================================================================
--- branches/subversion-subports/dports/devel/subversion/Portfile	2013-08-08 07:13:28 UTC (rev 109122)
+++ branches/subversion-subports/dports/devel/subversion/Portfile	2013-08-08 07:38:32 UTC (rev 109123)
@@ -44,7 +44,8 @@
         ${worksrcpath}/subversion/libsvn_subr/config_impl.h
 }
 
-configure.args          --with-apr=${prefix}/bin/apr-1-config \
+configure.args          --disable-keychain \
+                        --with-apr=${prefix}/bin/apr-1-config \
                         --with-apr-util=${prefix}/bin/apu-1-config \
                         --with-berkeley-db=:${prefix}/include/db46:${prefix}/lib/db46:db-4.6 \
                         --with-libmagic=${prefix} \
@@ -143,15 +144,19 @@
     }
 }
 
-variant disable_keychain description {Disables support for the Mac OS X Keychain} {
-    configure.args-append   --disable-keychain
+platform macosx {
+    # Legacy negative variant to be removed after August 2014.
+    variant disable_keychain conflicts osxkeychain description {Legacy compatibility variant} {}
+    variant osxkeychain conflicts disable_keychain description {Enable OS X Keychain support} {
+        configure.args-delete   --disable-keychain
+    }
+    if {[variant_isset disable_keychain]} {
+        default_variants        -osxkeychain
+    } else {
+        default_variants        +osxkeychain
+    }
 }
 
-# CarbonCore/MacTypes.h: No such file or directory
-platform puredarwin {
-    configure.args-append   --disable-keychain
-}
-
 livecheck.type          regex
 livecheck.url           http://svn.apache.org/repos/asf/subversion/tags/
 livecheck.regex         {(\d+\.\d+\.\d+)/}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130808/e580bb5a/attachment.html>