[137466] trunk/dports/devel/openssl/Portfile

[larryv at macports.org]

Revision: 137466
          https://trac.macports.org/changeset/137466
Author:   larryv at macports.org
Date:     2015-06-11 22:32:25 -0700 (Thu, 11 Jun 2015)
Log Message:
-----------
openssl: Rearrange and reformat

I prefer to group settings according to phase.

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

Modified: trunk/dports/devel/openssl/Portfile
===================================================================
--- trunk/dports/devel/openssl/Portfile	2015-06-12 03:55:05 UTC (rev 137465)
+++ trunk/dports/devel/openssl/Portfile	2015-06-12 05:32:25 UTC (rev 137466)
@@ -40,15 +40,12 @@
                     patch-Makefile.org-parallel.diff \
                     patch-crypto-perlasm-x86_64-xlate.pl.diff
 
-# We've tried patching some, but we're not there yet, see #46719
-use_parallel_build  no
-
 configure.ccache    no
 configure.perl      /usr/bin/perl
 configure.cmd       ./Configure
-configure.args      -L${prefix}/lib \
+configure.args     -L${prefix}/lib \
                     no-krb5 \
-                    --openssldir=${prefix}/etc/openssl \
+                  --openssldir=${prefix}/etc/openssl \
                     shared \
                     zlib
 # Use SDK if necessary.
@@ -57,51 +54,50 @@
                             -Wl,-syslibroot,${configure.sdkroot}
 }
 
-destroot.args       MANDIR=${prefix}/share/man MANSUFFIX=ssl
-destroot.destdir    INSTALL_PREFIX=${destroot}
-
-test.run            yes
-test.dir            ${worksrcpath}/test
-test.target         alltests
-
-livecheck.type      regex
-livecheck.url       ${master_sites}
-livecheck.regex     ${name}-(\[0-9.\]+\[a-z\]?)\\.tar\\.gz
-
-# code for universal build
+set merger_arch_compiler "no"
 array set merger_configure_args {
     ppc     darwin-ppc-cc
     i386    darwin-i386-cc
     ppc64   darwin64-ppc-cc
     x86_64  darwin64-x86_64-cc
 }
-platform darwin 8 {
-    append merger_configure_args(i386) " " no-asm
+platform darwin {
+    if {${os.major} <= 8} {
+        append merger_configure_args(i386) " " no-asm
+    }
 }
+# Do not set --host.
+array set merger_host {ppc {} i386 {} ppc64 {} x86_64 {}}
 
-if {[variant_isset universal]} {
-    set merger_arch_compiler "no"
+if {![variant_isset universal]
+        && [info exists merger_configure_args($build_arch)]} {
+    configure.args-append $merger_configure_args($build_arch)
+}
+configure.universal_args-delete --disable-dependency-tracking
 
-    configure.universal_args-delete --disable-dependency-tracking
+# We've tried patching some, but we're not there yet, see #46719
+use_parallel_build  no
 
+test.run            yes
+test.dir            ${worksrcpath}/test
+test.target         alltests
+
+if {[variant_isset universal]} {
     pre-destroot {
         global merger_dont_diff
         if {[llength ${universal_archs_to_use}] > 2} {
             lappend merger_dont_diff ${prefix}/include/openssl/opensslconf.h
         }
     }
-
-    # Do not set --host.
-    array set merger_host {
-        ppc     {}
-        i386    {}
-        ppc64   {}
-        x86_64  {}
-    }
-} elseif {[info exists merger_configure_args($build_arch)]} {
-    configure.args-append   $merger_configure_args($build_arch)
 }
 
+destroot.args       MANDIR=${prefix}/share/man MANSUFFIX=ssl
+destroot.destdir    INSTALL_PREFIX=${destroot}
+
 variant rfc3779 description {enable RFC 3779: X.509 Extensions for IP Addresses and AS Identifiers} {
     configure.args-append   enable-rfc3779
 }
+
+livecheck.type      regex
+livecheck.url       ${master_sites}
+livecheck.regex     ${name}-(\[0-9.\]+\[a-z\]?)\\.tar\\.gz
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150611/709e6bcc/attachment.html>