<!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>[128167] trunk/dports/net/nxcomp</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/128167">128167</a></dd>
<dt>Author</dt> <dd>cal@macports.org</dd>
<dt>Date</dt> <dd>2014-11-15 08:47:42 -0800 (Sat, 15 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>nxcomp/nxproxy: update to 3.5.0.28, remove patches integrated upstream</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsnetnxcompPortfile">trunk/dports/net/nxcomp/Portfile</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsnetnxcompfilespatchnxcomp__Loopcppyosemitecompatdiff">trunk/dports/net/nxcomp/files/patch-nxcomp__Loop.cpp-yosemite-compat.diff</a></li>
<li><a href="#trunkdportsnetnxcompfilespatchnxcomp__TypeshdontuseSTLinternalsonlibcdiff">trunk/dports/net/nxcomp/files/patch-nxcomp__Types.h-dont-use-STL-internals-on-libc++.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsnetnxcompPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/net/nxcomp/Portfile (128166 => 128167)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/nxcomp/Portfile        2014-11-15 08:17:41 UTC (rev 128166)
+++ trunk/dports/net/nxcomp/Portfile        2014-11-15 16:47:42 UTC (rev 128167)
</span><span class="lines">@@ -4,9 +4,9 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name nxcomp
</span><del>-version 3.5.0.27
-checksums rmd160 0612fb48de38f04f1f5aa3d4de995d60b7e1c50e \
- sha256 efbf6eed02b5eb2892828e2237dff4591442e96d0ac83f3d75c62a15101d6a27
</del><ins>+version 3.5.0.28
+checksums rmd160 c4e5bc6013c0ff72c0492d820cd8c52027e172ba \
+ sha256 f0f47a4fe63a20d39a51e1446bb86ffaec70b816853e6db28d2519e72d428a7c
</ins><span class="cx">
</span><span class="cx"> categories net
</span><span class="cx"> platforms darwin
</span><span class="lines">@@ -33,8 +33,6 @@
</span><span class="cx"> -I${prefix}/include
</span><span class="cx">
</span><span class="cx"> if {${name} eq ${subport}} {
</span><del>- revision 2
-
</del><span class="cx"> depends_lib-append port:libpng \
</span><span class="cx"> port:jpeg \
</span><span class="cx"> port:zlib \
</span><span class="lines">@@ -43,9 +41,7 @@
</span><span class="cx"> worksrcdir nx-libs-${version}/nxcomp
</span><span class="cx">
</span><span class="cx"> patchfiles patch-nxcomp__configure.in.diff \
</span><del>- patch-nxcomp__Makefile.in.diff \
- patch-nxcomp__Types.h-dont-use-STL-internals-on-libc++.diff \
- patch-nxcomp__Loop.cpp-yosemite-compat.diff
</del><ins>+ patch-nxcomp__Makefile.in.diff
</ins><span class="cx">
</span><span class="cx"> livecheck.url [lindex ${master_sites} 0]
</span><span class="cx"> livecheck.regex nx-libs-(\[0-9\]+(\\.\[0-9\]+)+(-\[0-9\]+)?)-lite
</span><span class="lines">@@ -54,7 +50,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> subport nxproxy {
</span><del>- revision 0
</del><span class="cx"> description nxproxy is a compressing proxy for X
</span><span class="cx"> long_description nxproxy is a library compressing X commands to be passed over network \
</span><span class="cx"> for use with x2go.
</span></span></pre></div>
<a id="trunkdportsnetnxcompfilespatchnxcomp__Loopcppyosemitecompatdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/net/nxcomp/files/patch-nxcomp__Loop.cpp-yosemite-compat.diff (128166 => 128167)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/nxcomp/files/patch-nxcomp__Loop.cpp-yosemite-compat.diff        2014-11-15 08:17:41 UTC (rev 128166)
+++ trunk/dports/net/nxcomp/files/patch-nxcomp__Loop.cpp-yosemite-compat.diff        2014-11-15 16:47:42 UTC (rev 128167)
</span><span class="lines">@@ -1,11 +0,0 @@
</span><del>---- Loop.cpp.orig        2014-10-19 16:28:40.000000000 +0200
-+++ Loop.cpp        2014-10-19 16:31:04.000000000 +0200
-@@ -4183,7 +4183,7 @@
-
- #ifdef __APPLE__
-
-- if (strncasecmp(display, "/tmp/launch", 11) == 0)
-+ if (strstr(display, "/") != NULL)
- {
- #ifdef TEST
- *logofs << "Loop: Using launchd service on socket '"
</del></span></pre></div>
<a id="trunkdportsnetnxcompfilespatchnxcomp__TypeshdontuseSTLinternalsonlibcdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/net/nxcomp/files/patch-nxcomp__Types.h-dont-use-STL-internals-on-libc++.diff (128166 => 128167)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/nxcomp/files/patch-nxcomp__Types.h-dont-use-STL-internals-on-libc++.diff        2014-11-15 08:17:41 UTC (rev 128166)
+++ trunk/dports/net/nxcomp/files/patch-nxcomp__Types.h-dont-use-STL-internals-on-libc++.diff        2014-11-15 16:47:42 UTC (rev 128167)
</span><span class="lines">@@ -1,37 +0,0 @@
</span><del>---- Types.h.orig        2013-11-05 01:35:22.000000000 +0100
-+++ Types.h        2013-11-05 01:37:30.000000000 +0100
-@@ -55,6 +55,9 @@
- return &*(vector < unsigned char >::begin());
- }
-
-+ // Avoid overriding clear() when using libc++. Fiddling with STL internals
-+ // doesn't really seem like a good idea to me anyway.
-+ #ifndef _LIBCPP_VECTOR
- void clear()
- {
- #if defined(__STL_USE_STD_ALLOCATORS) || defined(__GLIBCPP_INTERNAL_VECTOR_H)
-@@ -95,12 +98,16 @@
-
- #endif /* #if defined(__STL_USE_STD_ALLOCATORS) || defined(__GLIBCPP_INTERNAL_VECTOR_H) */
- }
-+ #endif /* #ifdef _LIBCPP_VECTOR */
- };
-
- class T_messages : public vector < Message * >
- {
- public:
-
-+ // Avoid overriding clear() when using libc++. Fiddling with STL internals
-+ // doesn't really seem like a good idea to me anyway.
-+ #ifndef _LIBCPP_VECTOR
- void clear()
- {
- #if defined(__STL_USE_STD_ALLOCATORS) || defined(__GLIBCPP_INTERNAL_VECTOR_H)
-@@ -141,6 +148,7 @@
-
- #endif /* #if defined(__STL_USE_STD_ALLOCATORS) || defined(__GLIBCPP_INTERNAL_VECTOR_H) */
- }
-+ #endif /* #ifndef _LIBCPP_VECTOR */
- };
-
- typedef md5_byte_t * T_checksum;
</del></span></pre>
</div>
</div>
</body>
</html>