<!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>[114713] trunk/dports/devel/cryptlib</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/114713">114713</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2013-12-13 21:48:15 -0800 (Fri, 13 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>cryptlib: update to 3.4.2; write an install target for the makefile instead of overriding the destroot phase, so that we can work on adding a universal variant with the muniversal portgroup (#41804)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevelcryptlibPortfile">trunk/dports/devel/cryptlib/Portfile</a></li>
<li><a href="#trunkdportsdevelcryptlibfilespatchmakefilediff">trunk/dports/devel/cryptlib/files/patch-makefile.diff</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsdevelcryptlibfilespatchcryptosconfighdiff">trunk/dports/devel/cryptlib/files/patch-crypt-osconfig.h.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsdevelcryptlibfilespatchcrypt_osconfigh">trunk/dports/devel/cryptlib/files/patch-crypt_osconfig.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevelcryptlibPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/cryptlib/Portfile (114712 => 114713)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/cryptlib/Portfile 2013-12-14 05:18:19 UTC (rev 114712)
+++ trunk/dports/devel/cryptlib/Portfile 2013-12-14 05:48:15 UTC (rev 114713)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> PortGroup conflicts_build 1.0
</span><span class="cx">
</span><span class="cx"> name cryptlib
</span><del>-version 3.4.1
</del><ins>+version 3.4.2
</ins><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> categories devel security crypto
</span><span class="cx"> platforms darwin
</span><span class="lines">@@ -29,8 +29,8 @@
</span><span class="cx"> distname cl[join [split $version .] ""]
</span><span class="cx"> use_zip yes
</span><span class="cx">
</span><del>-checksums rmd160 2272e20697e3e1d8b484ae9d571b08371b1319fb \
- sha256 d3057acbf4bc7d45694d8ec2621ee4027f9303d36cebdfe2af770567ec912c94
</del><ins>+checksums rmd160 c16757dbd44a50b211b5168fbc7ecf7c307b88d6 \
+ sha256 0ee4a7568ddb7de6b155b79844e25bc1a20af9439b0db38bfbd47a984be923a3
</ins><span class="cx">
</span><span class="cx"> pre-extract {
</span><span class="cx"> # DOS to UNIX line endings.
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> }
</span><span class="cx"> extract.mkdir yes
</span><span class="cx">
</span><del>-patchfiles patch-crypt_osconfig.h \
</del><ins>+patchfiles patch-crypt-osconfig.h.diff \
</ins><span class="cx"> patch-makefile.diff \
</span><span class="cx"> patch-tools-ccopts.sh.diff
</span><span class="cx">
</span><span class="lines">@@ -48,15 +48,14 @@
</span><span class="cx"> use_configure no
</span><span class="cx">
</span><span class="cx"> build.target default shared
</span><del>-build.env LIBDIR="${prefix}/lib" \
</del><ins>+build.env PREFIX="${prefix}" \
</ins><span class="cx"> CFLAGS="${configure.cflags} ${configure.cc_archflags}" \
</span><span class="cx"> LDFLAGS="${configure.ldflags} ${configure.ld_archflags}" \
</span><span class="cx"> CC="${configure.cc}"
</span><span class="cx">
</span><del>-destroot {
- xinstall -m 644 ${worksrcpath}/libcl.a ${worksrcpath}/libcl.${branch}.dylib ${destroot}${prefix}/lib
- ln -s libcl.${branch}.dylib ${destroot}${prefix}/lib/libcl.dylib
- xinstall -m 644 ${worksrcpath}/cryptlib.h ${destroot}${prefix}/include
</del><ins>+destroot.env PREFIX="${prefix}"
+
+post-destroot {
</ins><span class="cx"> xinstall -d ${destroot}${prefix}/share/doc/${name}
</span><span class="cx"> xinstall -m 644 ${worksrcpath}/README ${destroot}${prefix}/share/doc/${name}
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportsdevelcryptlibfilespatchcryptosconfighdifffromrev114695trunkdportsdevelcryptlibfilespatchcrypt_osconfigh"></a>
<div class="copfile"><h4>Copied: trunk/dports/devel/cryptlib/files/patch-crypt-osconfig.h.diff (from rev 114695, trunk/dports/devel/cryptlib/files/patch-crypt_osconfig.h) (0 => 114713)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/cryptlib/files/patch-crypt-osconfig.h.diff (rev 0)
+++ trunk/dports/devel/cryptlib/files/patch-crypt-osconfig.h.diff 2013-12-14 05:48:15 UTC (rev 114713)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+--- crypt/osconfig.h.orig 2012-11-06 01:14:56.000000000 -0600
++++ crypt/osconfig.h 2013-12-13 23:25:21.000000000 -0600
+@@ -310,6 +310,10 @@
+ #define DES_UNROLL
+ #define RC4_INDEX
+ #endif /* Mac OS variants */
++ #if defined( __LP64__ )
++ #undef SIXTY_FOUR_BIT
++ #define SIXTY_FOUR_BIT_LONG
++ #endif
+ #endif /* Mac OS X / iOS */
+
+ /* MSDOS */
</ins></span></pre></div>
<a id="trunkdportsdevelcryptlibfilespatchcrypt_osconfigh"></a>
<div class="delfile"><h4>Deleted: trunk/dports/devel/cryptlib/files/patch-crypt_osconfig.h (114712 => 114713)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/cryptlib/files/patch-crypt_osconfig.h 2013-12-14 05:18:19 UTC (rev 114712)
+++ trunk/dports/devel/cryptlib/files/patch-crypt_osconfig.h 2013-12-14 05:48:15 UTC (rev 114713)
</span><span class="lines">@@ -1,13 +0,0 @@
</span><del>---- crypt/osconfig.h.orig 2011-06-17 22:20:36.000000000 -0500
-+++ crypt/osconfig.h 2011-10-16 23:51:19.000000000 -0500
-@@ -259,6 +259,10 @@
- #else
- #define L_ENDIAN
- #endif
-+ #if defined( __LP64__ )
-+ #undef SIXTY_FOUR_BIT
-+ #define SIXTY_FOUR_BIT_LONG
-+ #endif
- #define BN_LLONG
- #define BF_PTR
- #define DES_RISC1
</del></span></pre></div>
<a id="trunkdportsdevelcryptlibfilespatchmakefilediff"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/cryptlib/files/patch-makefile.diff (114712 => 114713)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/cryptlib/files/patch-makefile.diff 2013-12-14 05:18:19 UTC (rev 114712)
+++ trunk/dports/devel/cryptlib/files/patch-makefile.diff 2013-12-14 05:48:15 UTC (rev 114713)
</span><span class="lines">@@ -1,40 +1,51 @@
</span><del>---- makefile.orig 2011-07-28 01:41:06.000000000 -0500
-+++ makefile 2011-10-17 21:24:31.000000000 -0500
-@@ -70,8 +70,8 @@
</del><ins>+--- makefile.orig 2012-12-14 03:31:22.000000000 -0600
++++ makefile 2013-12-13 23:41:55.000000000 -0600
+@@ -73,7 +73,7 @@
</ins><span class="cx"> # Further cc flags are gathered dynamically at runtime via the ccopts.sh
</span><span class="cx"> # script.
</span><span class="cx">
</span><del>--CFLAGS = "-c -D__UNIX__ -DNDEBUG -I."
--CFLAGS_DEBUG = "-c -D__UNIX__ -I. -g3 -ggdb"
-+CFLAGS += "-c -D__UNIX__ -DNDEBUG -I."
-+CFLAGS_DEBUG = "$(CFLAGS) -c -D__UNIX__ -I. -g3 -ggdb"
</del><ins>+-CFLAGS = -c -D__UNIX__ -DNDEBUG -I.
++CFLAGS += -c -D__UNIX__ -DNDEBUG -I.
+ CFLAGS_DEBUG = -c -D__UNIX__ -I. -g3 -ggdb -O0
</ins><span class="cx">
</span><span class="cx"> # Paths and command names. We have to be careful with comments attached to
</span><del>- # path defines because some makes don't strip trailing spaces.
-@@ -87,7 +87,6 @@
</del><ins>+@@ -90,7 +90,6 @@
</ins><span class="cx"> SHARED_OBJ_DIR = ./shared-obj
</span><span class="cx"> CPP = $(CC) -E
</span><span class="cx"> LD = $(CC)
</span><span class="cx"> -LDFLAGS =
</span><span class="cx"> AR = ar
</span><ins>+ STRIP = strip
</ins><span class="cx"> SHELL = /bin/sh
</span><del>- OSNAME = `uname`
-@@ -1453,7 +1452,8 @@
- $(EXTRAOBJS)
</del><ins>+@@ -1481,7 +1480,8 @@
+ $(STRIP) $(OBJS) $(EXTRAOBJS)
</ins><span class="cx">
</span><span class="cx"> $(DYLIBNAME): $(OBJS) $(EXTRAOBJS) $(TESTOBJS)
</span><span class="cx"> - @$(LD) -dynamiclib -compatibility_version $(MAJ).$(MIN) \
</span><del>-+ $(LD) $(LDFLAGS) -dynamiclib -install_name $(LIBDIR)/$(DYLIBNAME) \
</del><ins>++ $(LD) $(LDFLAGS) -dynamiclib -install_name $(PREFIX)/lib/$(DYLIBNAME) \
</ins><span class="cx"> + -compatibility_version $(MAJ).$(MIN) \
</span><span class="cx"> -current_version $(MAJ).$(MIN).$(PLV) \
</span><span class="cx"> -o $(DYLIBNAME) $(OBJS) $(EXTRAOBJS)
</span><span class="cx">
</span><del>-@@ -1847,7 +1847,7 @@
</del><ins>+@@ -1875,7 +1875,7 @@
</ins><span class="cx"> # decide to try it.
</span><span class="cx">
</span><span class="cx"> Darwin:
</span><span class="cx"> - @make $(DEFINES) CFLAGS="$(CFLAGS) -fomit-frame-pointer" LDFLAGS="-object -s"
</span><span class="cx"> + @make $(DEFINES) CFLAGS="$(CFLAGS) -fomit-frame-pointer"
</span><span class="cx">
</span><del>- # NCR MP-RAS: Use the NCR cc. The "-DNCR_UST" is needed to enable threading
- # (User-Space Threads).
</del><ins>+ # MinGW: cc is gcc. Note that we have to use the cross-compile flags
+ # XCFLAGS rather than CFLAGS because the latter implies a native Unix
+@@ -2657,3 +2657,12 @@
+ fi
+ @if [ `uname -s` = 'CYGWIN_NT-5.0' ] ; then rm -f *.exe; fi
+ @if [ `uname -s` = 'HP-UX' ] ; then rm -f lib$(PROJ).sl; fi
++
++
++install:
++ install -d $(DESTDIR)$(PREFIX)/lib
++ install -m 644 $(LIBNAME) $(DESTDIR)$(PREFIX)/lib
++ install -m 644 $(DYLIBNAME) $(DESTDIR)$(PREFIX)/lib
++ ln -s $(DYLIBNAME) $(DESTDIR)$(PREFIX)/lib/lib$(PROJ).dylib
++ install -d $(DESTDIR)$(PREFIX)/include
++ install -m 644 cryptlib.h $(DESTDIR)$(PREFIX)/include
</ins></span></pre>
</div>
</div>
</body>
</html>