<!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>[134458] 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/134458">134458</a></dd>
<dt>Author</dt> <dd>ionic@macports.org</dd>
<dt>Date</dt> <dd>2015-03-25 18:04:24 -0700 (Wed, 25 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>nxcomp: update to 3.5.0.31. Lose makedepend build dependency. Update patches. Delete one merged upstream.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsnetnxcompPortfile">trunk/dports/net/nxcomp/Portfile</a></li>
<li><a href="#trunkdportsnetnxcompfilespatchnxcomp__Makefileindiff">trunk/dports/net/nxcomp/files/patch-nxcomp__Makefile.in.diff</a></li>
<li><a href="#trunkdportsnetnxcompfilespatchnxproxy__configureindiff">trunk/dports/net/nxcomp/files/patch-nxproxy__configure.in.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsnetnxcompfilespatchnxcomp__configureindiff">trunk/dports/net/nxcomp/files/patch-nxcomp__configure.in.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 (134457 => 134458)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/nxcomp/Portfile 2015-03-26 01:04:18 UTC (rev 134457)
+++ trunk/dports/net/nxcomp/Portfile 2015-03-26 01:04:24 UTC (rev 134458)
</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.29
-checksums rmd160 c1d21150debe988377b7fa4bf0d9b84f06434c7f \
- sha256 573bc9622251333d0cf7411ee9a8457275fa04fade5c5562e4ed52398a77e51b
</del><ins>+version 3.5.0.31
+checksums rmd160 d5bf4b4ca76fbc54bf0d041ad7ee48e012e31df7 \
+ sha256 6dbaa60d9505454011d53e06ee60d44bd86ae43b7370d9c4d1ff8cfc65ee23c2
</ins><span class="cx">
</span><span class="cx"> categories net
</span><span class="cx"> platforms darwin
</span><span class="lines">@@ -25,8 +25,6 @@
</span><span class="cx"> universal_variant yes
</span><span class="cx"> supported_archs ppc i386 x86_64
</span><span class="cx">
</span><del>-depends_build port:makedepend
-
</del><span class="cx"> use_autoreconf yes
</span><span class="cx">
</span><span class="cx"> configure.cxxflags-append \
</span><span class="lines">@@ -40,8 +38,8 @@
</span><span class="cx">
</span><span class="cx"> worksrcdir nx-libs-${version}/nxcomp
</span><span class="cx">
</span><del>- patchfiles patch-nxcomp__configure.in.diff \
- patch-nxcomp__Makefile.in.diff
</del><ins>+ # Included in the upcoming 3.5.0.32 released. Can be removed then.
+ patchfiles 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></pre></div>
<a id="trunkdportsnetnxcompfilespatchnxcomp__Makefileindiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/net/nxcomp/files/patch-nxcomp__Makefile.in.diff (134457 => 134458)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/nxcomp/files/patch-nxcomp__Makefile.in.diff 2015-03-26 01:04:18 UTC (rev 134457)
+++ trunk/dports/net/nxcomp/files/patch-nxcomp__Makefile.in.diff 2015-03-26 01:04:24 UTC (rev 134458)
</span><span class="lines">@@ -1,55 +1,12 @@
</span><del>---- Makefile.in.orig 2015-03-13 19:50:21.000000000 +0100
-+++ Makefile.in 2015-03-13 19:51:27.000000000 +0100
-@@ -91,9 +91,17 @@
- LIBRARY = Xcomp
-
- LIBNAME = lib$(LIBRARY)
-+ifeq ($(shell uname),Darwin)
-+LIBFULL = lib$(LIBRARY).$(VERSION).dylib
-+LIBLOAD = lib$(LIBRARY).$(LIBVERSION).dylib
-+LIBSHARED = lib$(LIBRARY).dylib
-+LIBFLAGS = -install_name $(libdir)/$(LIBLOAD) -compatibility_version $(LIBVERSION) -current_version $(VERSION)
-+else
</del><ins>+--- Makefile.in.old 2015-03-26 01:23:41.000000000 +0100
++++ Makefile.in 2015-03-26 01:28:03.000000000 +0100
+@@ -95,7 +95,8 @@
+ LIBFULL = lib$(LIBRARY).$(VERSION).dylib
+ LIBLOAD = lib$(LIBRARY).$(LIBVERSION).dylib
+ LIBSHARED = lib$(LIBRARY).dylib
+-LIBFLAGS = -install_name $(libdir)/$(LIBLOAD) -compatibility_version $(LIBVERSION) -current_version $(VERSION)
++COMP_VER = $(shell echo '$(VERSION)' | cut -d '.' -f 1-3)
++LIBFLAGS = -install_name $(libdir)/$(LIBLOAD) -compatibility_version $(LIBVERSION) -current_version $(COMP_VER)
+ else
</ins><span class="cx"> LIBFULL = lib$(LIBRARY).so.$(VERSION)
</span><span class="cx"> LIBLOAD = lib$(LIBRARY).so.$(LIBVERSION)
</span><del>- LIBSHARED = lib$(LIBRARY).so
-+LIBFLAGS =
-+endif
- LIBARCHIVE = lib$(LIBRARY).a
-
- LIBCYGSHARED = cyg$(LIBRARY).dll
-@@ -232,7 +240,7 @@
- CXXOBJ = $(CXXSRC:.cpp=.o)
-
- $(LIBFULL): $(CXXOBJ) $(COBJ)
-- $(CXX) -o $@ $(LDFLAGS) $(CXXOBJ) $(COBJ) $(LIBS)
-+ $(CXX) -o $@ $(LDFLAGS) $(LIBFLAGS) $(CXXOBJ) $(COBJ) $(LIBS)
-
- $(LIBLOAD): $(LIBFULL)
- rm -f $(LIBLOAD)
-@@ -278,9 +286,9 @@
- ./mkinstalldirs $(DESTDIR)${libdir}
- ./mkinstalldirs $(DESTDIR)${includedir}/nx
- $(INSTALL_DATA) $(LIBFULL) $(DESTDIR)${libdir}
-- $(INSTALL_LINK) libXcomp.so.3 $(DESTDIR)${libdir}
-- $(INSTALL_LINK) libXcomp.so $(DESTDIR)${libdir}
-- $(INSTALL_DATA) libXcomp.a $(DESTDIR)${libdir}
-+ $(INSTALL_LINK) $(LIBLOAD) $(DESTDIR)${libdir}
-+ $(INSTALL_LINK) $(LIBSHARED) $(DESTDIR)${libdir}
-+ $(INSTALL_DATA) $(LIBARCHIVE) $(DESTDIR)${libdir}
- $(INSTALL_DATA) NX*.h $(DESTDIR)${includedir}/nx
- $(INSTALL_DATA) MD5.h $(DESTDIR)${includedir}/nx
- echo "Running ldconfig tool, this may take a while..." && ldconfig || true
-@@ -293,9 +301,9 @@
-
- uninstall.lib:
- $(RM_FILE) $(DESTDIR)${libdir}/$(LIBFULL)
-- $(RM_FILE) $(DESTDIR)${libdir}/libXcomp.so.3
-- $(RM_FILE) $(DESTDIR)${libdir}/libXcomp.so
-- $(RM_FILE) $(DESTDIR)${libdir}/libXcomp.a
-+ $(RM_FILE) $(DESTDIR)${libdir}/$(LIBLOAD)
-+ $(RM_FILE) $(DESTDIR)${libdir}/$(LIBSHARED)
-+ $(RM_FILE) $(DESTDIR)${libdir}/$(LIBARCHIVE)
- $(RM_FILE) $(DESTDIR)${includedir}/nx/NXalert.h
- $(RM_FILE) $(DESTDIR)${includedir}/nx/NX.h
- $(RM_FILE) $(DESTDIR)${includedir}/nx/NXmitshm.h
</del></span></pre></div>
<a id="trunkdportsnetnxcompfilespatchnxcomp__configureindiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/net/nxcomp/files/patch-nxcomp__configure.in.diff (134457 => 134458)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/nxcomp/files/patch-nxcomp__configure.in.diff 2015-03-26 01:04:18 UTC (rev 134457)
+++ trunk/dports/net/nxcomp/files/patch-nxcomp__configure.in.diff 2015-03-26 01:04:24 UTC (rev 134458)
</span><span class="lines">@@ -1,33 +0,0 @@
</span><del>---- configure.in.orig 2013-11-05 01:12:25.000000000 +0100
-+++ configure.in 2013-11-05 01:12:56.000000000 +0100
-@@ -187,7 +187,7 @@
- dnl the options -G -h.
-
- if test "$DARWIN" = yes; then
-- LDFLAGS="$LDFLAGS -bundle"
-+ LDFLAGS="$LDFLAGS -dynamiclib"
- elif test "$SUN" = yes; then
- LDFLAGS="$LDFLAGS -G -h \$(LIBLOAD)"
- else
-@@ -362,20 +362,7 @@
- dnl Find makedepend somewhere.
-
- AC_SUBST(MAKEDEPEND)
--
--if test -x "../nx-X11/config/makedepend/makedepend" ; then
-- MAKEDEPEND=../nx-X11/config/makedepend/makedepend
--else
-- if test -x "/usr/X11R6/bin/makedepend" ; then
-- MAKEDEPEND=/usr/X11R6/bin/makedepend
-- else
-- if test -x "/usr/openwin/bin/makedepend" ; then
-- MAKEDEPEND=/usr/openwin/bin/makedepend
-- else
-- MAKEDEPEND=/usr/bin/makedepend
-- fi
-- fi
--fi
-+MAKEDEPEND=`which makedepend`
-
- dnl Determine what to build based on the platform.
- dnl Override the LIBS settings on Cygwin32 so that
</del></span></pre></div>
<a id="trunkdportsnetnxcompfilespatchnxproxy__configureindiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/net/nxcomp/files/patch-nxproxy__configure.in.diff (134457 => 134458)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/nxcomp/files/patch-nxproxy__configure.in.diff 2015-03-26 01:04:18 UTC (rev 134457)
+++ trunk/dports/net/nxcomp/files/patch-nxproxy__configure.in.diff 2015-03-26 01:04:24 UTC (rev 134458)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- configure.in.orig 2013-11-05 01:45:25.000000000 +0100
-+++ configure.in 2013-11-05 01:46:40.000000000 +0100
-@@ -161,25 +161,12 @@
</del><ins>+--- configure.in.old 2015-03-26 01:16:58.000000000 +0100
++++ configure.in 2015-03-26 01:19:16.000000000 +0100
+@@ -161,7 +161,7 @@
</ins><span class="cx"> if test "$CYGWIN32" = yes; then
</span><span class="cx"> LIBS="$LIBS -L../nxcomp -lXcomp -lstdc++ -Wl,-e,_mainCRTStartup -ljpeg -lpng -lz"
</span><span class="cx"> else
</span><span class="lines">@@ -9,22 +9,3 @@
</span><span class="cx"> fi
</span><span class="cx">
</span><span class="cx"> dnl Find makedepend somewhere.
</span><del>-
- AC_SUBST(MAKEDEPEND)
--
--if test -x "../nx-X11/config/makedepend/makedepend" ; then
-- MAKEDEPEND=../nx-X11/config/makedepend/makedepend
--else
-- if test -x "/usr/X11R6/bin/makedepend" ; then
-- MAKEDEPEND=/usr/X11R6/bin/makedepend
-- else
-- if test -x "/usr/openwin/bin/makedepend" ; then
-- MAKEDEPEND=/usr/openwin/bin/makedepend
-- else
-- MAKEDEPEND=makedepend
-- fi
-- fi
--fi
-+MAKEDEPEND=`which makedepend`
-
- AC_OUTPUT(Makefile)
</del></span></pre>
</div>
</div>
</body>
</html>