<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[132606] trunk/dports/devel/openssl/Portfile</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/132606">132606</a></dd>
<dt>Author</dt> <dd>larryv@macports.org</dd>
<dt>Date</dt> <dd>2015-02-05 12:51:25 -0800 (Thu, 05 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>openssl: Add modeline, rearrange, reformat
Might as well make myself at home.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevelopensslPortfile">trunk/dports/devel/openssl/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevelopensslPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/openssl/Portfile (132605 => 132606)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/openssl/Portfile 2015-02-05 20:51:21 UTC (rev 132605)
+++ trunk/dports/devel/openssl/Portfile 2015-02-05 20:51:25 UTC (rev 132606)
</span><span class="lines">@@ -1,11 +1,12 @@
</span><ins>+# -*- 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
</ins><span class="cx"> # $Id$
</span><span class="cx">
</span><del>-PortSystem 1.0
-PortGroup muniversal 1.0
</del><ins>+PortSystem 1.0
+PortGroup muniversal 1.0
</ins><span class="cx">
</span><span class="cx"> name openssl
</span><ins>+epoch 1
</ins><span class="cx"> version 1.0.1k
</span><del>-epoch 1
</del><span class="cx">
</span><span class="cx"> # At least the following ports statically link OpenSSL and need to be revbumped
</span><span class="cx"> # for every update of OpenSSL:
</span><span class="lines">@@ -16,19 +17,22 @@
</span><span class="cx"> # - tor
</span><span class="cx"> # These lists aren't exhaustive. Feel free to add more entries as you find them.
</span><span class="cx">
</span><ins>+categories devel security
</ins><span class="cx"> platforms darwin
</span><del>-categories devel security
</del><ins>+license OpenSSL SSLeay
</ins><span class="cx"> maintainers larryv openmaintainer
</span><ins>+
+description OpenSSL SSL/TLS cryptography library
+long_description The OpenSSL Project is a collaborative effort to \
+ develop a robust, commercial-grade, full-featured, \
+ and Open Source toolkit implementing the Secure \
+ Sockets Layer (SSL v2/v3) and Transport Layer \
+ Security (TLS v1) protocols as well as \
+ a full-strength general purpose cryptography \
+ library.
</ins><span class="cx"> homepage http://www.openssl.org/
</span><del>-license OpenSSL SSLeay
-description OpenSSL SSL/TLS cryptography library
</del><span class="cx">
</span><del>-long_description \
- The OpenSSL Project is a collaborative effort to develop a robust, \
- commercial-grade, full-featured, and Open Source toolkit implementing \
- the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security \
- (TLS v1) protocols as well as a full-strength general purpose \
- cryptography library.
</del><ins>+depends_lib port:zlib
</ins><span class="cx">
</span><span class="cx"> master_sites http://www.openssl.org/source/
</span><span class="cx"> checksums md5 d4f002bd22a56881340105028842ae1f \
</span><span class="lines">@@ -36,27 +40,33 @@
</span><span class="cx"> rmd160 e22c085189c6ce640378f0cc67faa512b4b873f2 \
</span><span class="cx"> sha256 8f9faeaebad088e772f4ef5e38252d472be4d878c6b3a2718c10a4fcebe7a41c
</span><span class="cx">
</span><del>-depends_lib port:zlib
-
-patchfiles patch-Makefile.org.diff patch-crypto-Makefile.diff \
</del><ins>+patchfiles patch-bn_internal.pod.diff \
+ patch-Configure.diff \
+ patch-crypto-Makefile.diff \
</ins><span class="cx"> patch-Makefile.org-parallel.diff \
</span><del>- patch-bn_internal.pod.diff patch-Configure.diff
-
</del><ins>+ patch-Makefile.org.diff
</ins><span class="cx"> post-patch {
</span><span class="cx"> # Ensure that the correct compiler is used
</span><span class="cx"> reinplace "s|cc:|${configure.cc}:|" ${worksrcpath}/Configure
</span><span class="cx"> # use SDK if necessary
</span><del>- if {${configure.sdkroot} != ""} {
</del><ins>+ if {${configure.sdkroot} ne ""} {
</ins><span class="cx"> reinplace "s|\\(-arch \[_a-zA-Z0-9\]*\\)|\\1 -isysroot ${configure.sdkroot}|" ${worksrcpath}/Configure
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+configure.ccache no
</ins><span class="cx"> configure.cmd ./Configure
</span><del>-configure.args -L${prefix}/lib --openssldir=${prefix}/etc/openssl zlib no-krb5 shared
-configure.ccache no
</del><ins>+configure.args -L${prefix}/lib \
+ no-krb5 \
+ --openssldir=${prefix}/etc/openssl \
+ shared \
+ zlib
+platform darwin 8 i386 {
+ configure.args-append no-asm
+}
</ins><span class="cx">
</span><ins>+destroot.args MANDIR=${prefix}/share/man MANSUFFIX=ssl
</ins><span class="cx"> destroot.destdir INSTALL_PREFIX=${destroot}
</span><del>-destroot.args MANDIR=${prefix}/share/man MANSUFFIX=ssl
</del><span class="cx">
</span><span class="cx"> test.run yes
</span><span class="cx"> test.dir ${worksrcpath}/test
</span><span class="lines">@@ -66,41 +76,37 @@
</span><span class="cx"> livecheck.url ${master_sites}
</span><span class="cx"> livecheck.regex ${name}-(\[0-9.\]+\[a-z\]?)\\.tar\\.gz
</span><span class="cx">
</span><del>-variant rfc3779 description {enable RFC 3779: X.509 Extensions for IP Addresses and AS Identifiers} {
- configure.args-append enable-rfc3779
-}
-
</del><span class="cx"> # code for universal build
</span><span class="cx"> array set merger_configure_args {
</span><del>- ppc darwin-ppc-cc
- i386 darwin-i386-cc
- ppc64 darwin64-ppc-cc
- x86_64 darwin64-x86_64-cc
</del><ins>+ ppc darwin-ppc-cc
+ i386 darwin-i386-cc
+ ppc64 darwin64-ppc-cc
+ x86_64 darwin64-x86_64-cc
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-if { [variant_isset universal] } {
</del><ins>+if {[variant_isset universal]} {
</ins><span class="cx"> set merger_arch_compiler "no"
</span><span class="cx">
</span><span class="cx"> configure.universal_args-delete --disable-dependency-tracking
</span><span class="cx">
</span><span class="cx"> pre-destroot {
</span><span class="cx"> global merger_dont_diff
</span><del>- if { [llength ${universal_archs_to_use}] > 2 } {
</del><ins>+ if {[llength ${universal_archs_to_use}] > 2} {
</ins><span class="cx"> lappend merger_dont_diff ${prefix}/include/openssl/opensslconf.h
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # Do not set --host.
</span><span class="cx"> array set merger_host {
</span><del>- ppc ""
- i386 ""
- ppc64 ""
- x86_64 ""
</del><ins>+ ppc {}
+ i386 {}
+ ppc64 {}
+ x86_64 {}
</ins><span class="cx"> }
</span><span class="cx"> } elseif {[info exists merger_configure_args($build_arch)]} {
</span><span class="cx"> configure.args-append $merger_configure_args($build_arch)
</span><span class="cx"> }
</span><span class="cx">
</span><del>-platform darwin 8 i386 {
- configure.args-append no-asm
</del><ins>+variant rfc3779 description {enable RFC 3779: X.509 Extensions for IP Addresses and AS Identifiers} {
+ configure.args-append enable-rfc3779
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>