<!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>[118664] trunk/dports/devel/readline</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/118664">118664</a></dd>
<dt>Author</dt> <dd>mcalhoun@macports.org</dd>
<dt>Date</dt> <dd>2014-04-07 13:05:56 -0700 (Mon, 07 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>readline:
* Update version 6.2.0->6.3.3
* Remove some dead code
* Reduce the number of links to older versions of the library.
* Fixes #43266.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevelreadlinePortfile">trunk/dports/devel/readline/Portfile</a></li>
<li><a href="#trunkdportsdevelreadlinefilespatchshobjconfdiff">trunk/dports/devel/readline/files/patch-shobj-conf.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevelreadlinePortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/readline/Portfile (118663 => 118664)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/readline/Portfile 2014-04-07 19:47:47 UTC (rev 118663)
+++ trunk/dports/devel/readline/Portfile 2014-04-07 20:05:56 UTC (rev 118664)
</span><span class="lines">@@ -4,8 +4,8 @@
</span><span class="cx"> PortGroup muniversal 1.0
</span><span class="cx">
</span><span class="cx"> name readline
</span><del>-set milestone 6.2
-set patchlevel 000
</del><ins>+set milestone 6.3
+set patchlevel 003
</ins><span class="cx"> version ${milestone}.${patchlevel}
</span><span class="cx"> distname ${name}-${milestone}
</span><span class="cx"> categories devel
</span><span class="lines">@@ -34,21 +34,26 @@
</span><span class="cx"> set lastpatch 0
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+# remove "-arch_only `/usr/bin/arch`"
</ins><span class="cx"> patchfiles-append patch-shobj-conf.diff
</span><span class="cx"> while {$i <= $lastpatch} {
</span><span class="cx"> patchfiles-append ${patchname}-[format "%03d" $i]
</span><span class="cx"> incr i
</span><span class="cx"> }
</span><span class="cx">
</span><del>-post-patch {
- reinplace "s|__MACPORTS_PATCHLEVEL__|${patchlevel}|" ${worksrcpath}/support/shobj-conf
-}
</del><ins>+checksums ${patchname}-001 \
+ rmd160 feb98062e9407192a65ab85d62e54b947f119d97 \
+ sha256 1a79bbb6eaee750e0d6f7f3d059b30a45fc54e8e388a8e05e9c3ae598590146f \
+ ${patchname}-002 \
+ rmd160 8985874564ff3d1630231e333e87d7d7596fbe63 \
+ sha256 39e304c7a526888f9e112e733848215736fb7b9d540729b9e31f3347b7a1e0a5 \
+ ${patchname}-003 \
+ rmd160 bc0765b54e0e97cacfe9ddbacc123b4ce007e350 \
+ sha256 ec41bdd8b00fd884e847708513df41d51b1243cecb680189e31b7173d01ca52f \
+ ${distfiles} \
+ rmd160 986262d811d9dbe1e38bc9d714853272967dca7e \
+ sha256 56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43
</ins><span class="cx">
</span><del>-checksums ${distfiles} \
- md5 67948acb2ca081f23359d0256e9a271c \
- sha1 a9761cd9c3da485eb354175fcc2fe35856bc43ac \
- rmd160 5e7fb934e7c83cd0cd37463f7865bc257c3ea743
-
</del><span class="cx"> configure.args --with-curses
</span><span class="cx">
</span><span class="cx"> configure.universal_args-delete --disable-dependency-tracking
</span><span class="lines">@@ -66,11 +71,19 @@
</span><span class="cx"> ${destroot}${docdir}/html
</span><span class="cx"> }
</span><span class="cx">
</span><del>-# Install symlinks to avoid breaking ports linked against the old versions
</del><ins>+# Prior to 6.3, the "install_name" of shared libraries were
+# libreadline.X.Y.dylib and libhistory.X.Y.dylib instead of
+# libreadline.X.dylib and libhistory.X.dylib
+# Therefore, when upgrading, symlinks were installed to avoid breaking ports linked
+# against old versions.
+# This was fixed in 6.3.
+# For 6.4, therefore, the following should probably be removed.
+# Version 6.1 hasn't been around for over three years (76438), so only create a
+# link for 6.2.
</ins><span class="cx"> platform darwin {
</span><span class="cx"> post-destroot {
</span><span class="cx"> foreach f {history readline} {
</span><del>- foreach v {5.0 5.1 5.2 6.1} {
</del><ins>+ foreach v {6.2} {
</ins><span class="cx"> ln -sf lib${f}.${milestone}.dylib ${destroot}${prefix}/lib/lib${f}.${v}.dylib
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -79,11 +92,6 @@
</span><span class="cx">
</span><span class="cx"> if {[variant_isset universal]} {
</span><span class="cx">
</span><del>- pre-configure {
- # Eliminate warning.
- configure.args-delete --disable-dependency-tracking
- }
-
</del><span class="cx"> configure.args-append bash_cv_must_reinstall_sighandlers=no \
</span><span class="cx"> bash_cv_func_sigsetjmp=present \
</span><span class="cx"> bash_cv_func_strcoll_broken=no \
</span></span></pre></div>
<a id="trunkdportsdevelreadlinefilespatchshobjconfdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/readline/files/patch-shobj-conf.diff (118663 => 118664)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/readline/files/patch-shobj-conf.diff 2014-04-07 19:47:47 UTC (rev 118663)
+++ trunk/dports/devel/readline/files/patch-shobj-conf.diff 2014-04-07 20:05:56 UTC (rev 118664)
</span><span class="lines">@@ -1,41 +1,18 @@
</span><del>---- support/shobj-conf.orig 2009-10-29 00:20:21.000000000 +1100
-+++ support/shobj-conf 2011-03-24 13:43:03.000000000 +1100
-@@ -157,19 +157,19 @@
- ;
-
- # Darwin/MacOS X
--darwin[89]*|darwin10*)
-+darwin[89]*|darwin1[0-9]*)
- SHOBJ_STATUS=supported
- SHLIB_STATUS=supported
-
- SHOBJ_CFLAGS='-fno-common'
-
-- SHOBJ_LD='MACOSX_DEPLOYMENT_TARGET=10.3 ${CC}'
-+ SHOBJ_LD='${CC}'
-
- SHLIB_LIBVERSION='$(SHLIB_MAJOR)$(SHLIB_MINOR).$(SHLIB_LIBSUFF)'
- SHLIB_LIBSUFF='dylib'
-
-- SHOBJ_LDFLAGS='-dynamiclib -dynamic -undefined dynamic_lookup -arch_only `/usr/bin/arch`'
-- SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
-+ SHOBJ_LDFLAGS='-dynamiclib -dynamic -undefined dynamic_lookup'
-+ SHLIB_XLDFLAGS='-dynamiclib -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
-
- SHLIB_LIBS='-lncurses' # see if -lcurses works on MacOS X 10.1
- ;
-@@ -186,11 +186,11 @@
- SHLIB_LIBSUFF='dylib'
-
- case "${host_os}" in
-- darwin[789]*|darwin10*) SHOBJ_LDFLAGS=''
-- SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
-+ darwin[789]*|darwin1[0-9]*) SHOBJ_LDFLAGS=''
-+ SHLIB_XLDFLAGS='-dynamiclib -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
</del><ins>+--- support/shobj-conf.orig 2014-02-23 19:06:29.000000000 -0700
++++ support/shobj-conf 2014-04-07 09:23:17.000000000 -0700
+@@ -189,13 +189,13 @@
+ darwin[1-7].*)
+ SHOBJ_STATUS=unsupported
+ SHOBJ_LDFLAGS='-dynamic'
+- SHLIB_XLDFLAGS='-arch_only `/usr/bin/arch` -install_name $(libdir)/`echo $@ | sed "s:\\..*::"`.$(SHLIB_MAJOR).$(SHLIB_LIBSUFF) -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
++ SHLIB_XLDFLAGS='-install_name $(libdir)/`echo $@ | sed "s:\\..*::"`.$(SHLIB_MAJOR).$(SHLIB_LIBSUFF) -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
+ ;
+ # Darwin 8 == Mac OS X 10.4; Mac OS X 10.N == Darwin N+4
+ *)
+ case "${host_os}" in
+ darwin[89]*|darwin1[012]*)
+- SHOBJ_ARCHFLAGS='-arch_only `/usr/bin/arch`'
++ SHOBJ_ARCHFLAGS=
</ins><span class="cx"> ;
</span><del>- *) SHOBJ_LDFLAGS='-dynamic'
-- SHLIB_XLDFLAGS='-arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
-+ SHLIB_XLDFLAGS='-install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
- ;
- esac
-
</del><ins>+ *) # Mac OS X 10.9 (Mavericks) and later
+ SHOBJ_ARCHFLAGS=
</ins></span></pre>
</div>
</div>
</body>
</html>