<pre style='margin:0'>
Mihai Moldovan (Ionic) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/3e375eec016b31aa092da8a8b3f1932a0921dd5e">https://github.com/macports/macports-ports/commit/3e375eec016b31aa092da8a8b3f1932a0921dd5e</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 3e375ee net/nxcomp: update to 3.5.99.14.
</span>3e375ee is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3e375eec016b31aa092da8a8b3f1932a0921dd5e
</span>Author: Mihai Moldovan <ionic@ionic.de>
AuthorDate: Fri Mar 2 05:45:19 2018 +0100
<span style='display:block; white-space:pre;color:#404040;'> net/nxcomp: update to 3.5.99.14.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also:
</span><span style='display:block; white-space:pre;color:#404040;'> - switch to HTTPS-based links
</span><span style='display:block; white-space:pre;color:#404040;'> - modernize maintainer field
</span><span style='display:block; white-space:pre;color:#404040;'> - modernize checksums field
</span>---
net/nxcomp/Portfile | 33 ++++++++-------
...p-Auth.cpp-fix-X-cookie-fetch-with-launchd.diff | 47 ----------------------
.../files/patch-nxcomp_configure.ac-use-sed-E.diff | 11 +++++
.../files/patch-nxcomp_cp-compat-for-10.5-.diff | 11 -----
net/nxcomp/files/patch-nxproxy_Makefile.in.diff | 16 --------
net/nxcomp/files/patch-nxproxy_configure.in.diff | 11 -----
...xproxy_src_Makefile.am-use-system-libXcomp.diff | 11 +++++
7 files changed, 38 insertions(+), 102 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/nxcomp/Portfile b/net/nxcomp/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 879e2ca..3daa31d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/nxcomp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/nxcomp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,23 +3,24 @@
</span> PortSystem 1.0
name nxcomp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.5.0.32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.5.99.14
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 586897c72b64afd26ad78648efef70320784e49e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b5ab9f0ae35cdf6c3e26484d2a2ca55cd0225b6d8693f5544a096b19585bc50a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 b608df939adf4ffab56f4b16b5240a3ce6fb815f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d6868702369cd852df0f111eea8734312dd085d88fe8e58da9d2e18a768fa54a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 725296
</span>
categories net
platforms darwin
license GPL-2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers ionic openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {ionic @ionic} openmaintainer
</span>
description nxcomp is the X compression library by NX
long_description nxcomp is a library compressing X commands to be passed over network \
for use with the X2Go suite.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://wiki.x2go.org/doku.php/wiki:libs:nx-libs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites http://code.x2go.org/releases/source/nx-libs/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://wiki.x2go.org/doku.php/wiki:libs:nx-libs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites https://code.x2go.org/releases/source/nx-libs/
</span> distname nx-libs-${version}-lite
universal_variant yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,11 +28,15 @@ supported_archs ppc i386 x86_64
</span>
use_autoreconf yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cxxflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cppflags-append \
</span> -I${prefix}/include
<span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append --disable-silent-rules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {${name} eq ${subport}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span>
depends_lib-append port:libpng \
path:lib/libjpeg.dylib:jpeg \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,11 +45,7 @@ if {${name} eq ${subport}} {
</span>
worksrcdir nx-libs-${version}/nxcomp
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} < 10} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles patch-nxcomp_cp-compat-for-10.5-.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-nxcomp-Auth.cpp-fix-X-cookie-fetch-with-launchd.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-nxcomp_configure.ac-use-sed-E.diff
</span>
livecheck.url [lindex ${master_sites} 0]
livecheck.regex nx-libs-(\[0-9\]+(\\.\[0-9\]+)+(-\[0-9\]+)?)-lite
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,9 +62,7 @@ subport nxproxy {
</span>
worksrcdir nx-libs-${version}/nxproxy
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles patch-nxproxy_configure.in.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-nxproxy_Makefile.in.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-nxproxy_src_Makefile.am-use-system-libXcomp.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ldflags-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -L${prefix}/lib/nx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cppflags-append -I${prefix}/include/nx
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/nxcomp/files/patch-nxcomp-Auth.cpp-fix-X-cookie-fetch-with-launchd.diff b/net/nxcomp/files/patch-nxcomp-Auth.cpp-fix-X-cookie-fetch-with-launchd.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 03b718c..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/nxcomp/files/patch-nxcomp-Auth.cpp-fix-X-cookie-fetch-with-launchd.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,47 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Auth.cpp.old 2017-11-03 15:34:07.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Auth.cpp 2017-11-03 15:35:12.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -267,11 +267,33 @@ int Auth::getCookie()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char line[DEFAULT_STRING_LIMIT];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ FILE *data = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int result = -1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (strncmp(display_, "localhost:", 10) == 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- snprintf(line, DEFAULT_STRING_LIMIT, "unix:%s", display_ + 10);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else if ((0 == strncasecmp(display_, "/tmp/launch", 11)) || (0 == strncasecmp(display_, "/private/tmp/com.apple.launchd", 30)))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * Launchd socket support, mostly for OS X, but maybe also other BSD derivates.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const char *separator = strrchr(display_, ':');
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ((NULL == separator) || (!isdigit(*(separator + 1))))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #ifdef PANIC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *logofs << "Auth: PANIC! Unable to find separating colon character '"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ << "in launchd socket path '" << display_
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ << "'.\n" << logofs_flush;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ goto AuthGetCookieResult;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ snprintf(line, DEFAULT_STRING_LIMIT, "unix:%s", separator + 1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- snprintf(line, DEFAULT_STRING_LIMIT, "%.200s", display_);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -304,9 +326,7 @@ int Auth::getCookie()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // implementation.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- FILE *data = Popen((char *const *) parameters, "r");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- int result = -1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ data = Popen((char *const *) parameters, "r");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (data == NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/nxcomp/files/patch-nxcomp_configure.ac-use-sed-E.diff b/net/nxcomp/files/patch-nxcomp_configure.ac-use-sed-E.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..7af8e7d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/nxcomp/files/patch-nxcomp_configure.ac-use-sed-E.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac.old 2018-02-28 10:53:45.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac 2018-03-02 05:04:20.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22,7 +22,7 @@ AC_PROG_LIBTOOL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMP_VERSION=nxcomp_version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_SUBST([COMP_VERSION])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LT_COMP_VERSION=[`echo $COMP_VERSION | sed -r -e 's/^([0-9]+\.[0-9]+\.[0-9]+).*$/\1/' -e 's/\./:/g'`]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LT_COMP_VERSION=[`echo $COMP_VERSION | sed -E -e 's/^([0-9]+\.[0-9]+\.[0-9]+).*$/\1/' -e 's/\./:/g'`]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_SUBST([LT_COMP_VERSION])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Silence warning: ar: 'u' modifier ignored since 'D' is the default
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/nxcomp/files/patch-nxcomp_cp-compat-for-10.5-.diff b/net/nxcomp/files/patch-nxcomp_cp-compat-for-10.5-.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9125851..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/nxcomp/files/patch-nxcomp_cp-compat-for-10.5-.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.in.old 2015-07-04 04:55:31.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile.in 2016-09-30 03:20:58.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -70,7 +70,7 @@ includedir = @includedir@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INSTALL = @INSTALL@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INSTALL_PROGRAM = @INSTALL_PROGRAM@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INSTALL_DATA = @INSTALL_DATA@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--INSTALL_LINK = cp -av
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+INSTALL_LINK = cp -pPRv
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DESTDIR =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RM_FILE = rm -f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/nxcomp/files/patch-nxproxy_Makefile.in.diff b/net/nxcomp/files/patch-nxproxy_Makefile.in.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index bb890a8..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/nxcomp/files/patch-nxproxy_Makefile.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.in.org 2013-03-05 00:30:16.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile.in 2013-03-05 00:31:20.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -15,11 +15,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -Wmissing-declarations -Wnested-externs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--CXXINCLUDES = -I. -I../nxcomp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CXXINCLUDES = -I. -I@prefix@/include/nx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CC = @CC@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CCFLAGS = $(CXXFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--CCINCLUDES = -I. -I../nxcomp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CCINCLUDES = -I. -I@prefix@/include/nx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CCDEFINES =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS = @LDFLAGS@
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/nxcomp/files/patch-nxproxy_configure.in.diff b/net/nxcomp/files/patch-nxproxy_configure.in.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 4aec828..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/nxcomp/files/patch-nxproxy_configure.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.in.old 2015-03-26 01:16:58.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.in 2015-03-26 01:19:16.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -161,7 +161,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "$CYGWIN32" = yes; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBS="$LIBS -L../nxcomp -lXcomp -lstdc++ -Wl,-e,_mainCRTStartup -ljpeg -lpng -lz"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LIBS="$LIBS -L../nxcomp -lXcomp"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LIBS="$LIBS -lXcomp"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dnl Find makedepend somewhere.
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/nxcomp/files/patch-nxproxy_src_Makefile.am-use-system-libXcomp.diff b/net/nxcomp/files/patch-nxproxy_src_Makefile.am-use-system-libXcomp.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..d002ef1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/nxcomp/files/patch-nxproxy_src_Makefile.am-use-system-libXcomp.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/Makefile.am.old 2018-02-28 10:53:45.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/Makefile.am 2018-03-02 05:37:00.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -10,7 +10,7 @@ nxproxy_SOURCES = \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ nxproxy_LDADD = \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @PTHREAD_LIBS@ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -L$(top_srcdir)/../nxcomp/src/.libs -lXcomp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -lXcomp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ nxproxy_LDFLAGS = \
</span></pre><pre style='margin:0'>
</pre>