<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/82688dc4a0531549b8efbd0723237c1453290b1f">https://github.com/macports/macports-ports/commit/82688dc4a0531549b8efbd0723237c1453290b1f</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 82688dc4a05 n2n: update to 3.1.1
</span>82688dc4a05 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 82688dc4a0531549b8efbd0723237c1453290b1f
</span>Author: Sergey Fedorov <vital.had@gmail.com>
AuthorDate: Fri Sep 9 01:02:25 2022 +0700
<span style='display:block; white-space:pre;color:#404040;'> n2n: update to 3.1.1
</span>---
net/n2n/Portfile | 33 +++++++++------------
net/n2n/files/DESTDIR.patch | 48 -------------------------------
net/n2n/files/configure.seed.patch | 12 --------
net/n2n/files/no-space-after-L-or-I.patch | 15 ----------
net/n2n/files/patch-man-prefix.diff | 17 +++++++++++
5 files changed, 31 insertions(+), 94 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/n2n/Portfile b/net/n2n/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c8aeaf17041..45f210f974d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/n2n/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/n2n/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +1,15 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span> PortGroup github 1.0
PortGroup openssl 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup ntop n2n 3.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup ntop n2n 3.1.1
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 7bd54afd91bb0dce2fc033ba82873d7c6f76190a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 25fcabba7bfcf25f4c9cd7fecc7ce11de48beb0b0f3506053d8485604ea8f50d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 478311
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 c39890517dcf02bf6e1eeacf78a68cfe39767e9b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 311f89d147558ae4dfb0d8f8698f5429c05a3e19a9d25cb8c85bd73d02aff834 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 498277
</span>
categories net
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,24 +25,18 @@ github.tarball_from archive
</span>
openssl.branch 1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# No configure script in tarball.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_autoreconf yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-autoreconf.cmd ./autogen.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-autoreconf.args
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:autoconf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:automake \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libtool
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:zstd
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:zstd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_run-append port:tuntaposx
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_run port:tuntaposx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-man-prefix.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles configure.seed.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DESTDIR.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- no-space-after-L-or-I.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --with-openssl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-zstd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DN2N_OPTION_USE_OPENSSL=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DN2N_OPTION_USE_ZSTD=ON
</span>
destroot.args PREFIX="${prefix}"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/n2n/files/DESTDIR.patch b/net/n2n/files/DESTDIR.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index c08720747de..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/n2n/files/DESTDIR.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,48 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Use correct default for PREFIX and support DESTDIR properly.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.in.orig 2021-10-27 13:43:08.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile.in 2021-12-21 01:56:36.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -66,13 +66,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INSTALL_PROG=$(INSTALL) -m755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INSTALL_DOC=$(INSTALL) -m644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# DESTDIR set in debian make system
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--PREFIX?=$(DESTDIR)/usr
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ifeq ($(CONFIG_TARGET),darwin)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--SBINDIR=$(PREFIX)/local/sbin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+PREFIX?=/usr/local
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SBINDIR=$(PREFIX)/sbin
</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;'>- MANDIR?=$(PREFIX)/share/man
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MAN1DIR=$(MANDIR)/man1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -238,14 +233,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rm -f $(addprefix src/,$(APPS))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install: edge supernode edge.8.gz supernode.1.gz n2n.7.gz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- echo "MANDIR=$(MANDIR)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(MKDIR) $(SBINDIR) $(MAN1DIR) $(MAN7DIR) $(MAN8DIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(INSTALL_PROG) supernode $(SBINDIR)/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(INSTALL_PROG) edge $(SBINDIR)/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(INSTALL_DOC) edge.8.gz $(MAN8DIR)/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(INSTALL_DOC) supernode.1.gz $(MAN1DIR)/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(INSTALL_DOC) n2n.7.gz $(MAN7DIR)/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(MAKE) -C tools install SBINDIR=$(abspath $(SBINDIR))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(MKDIR) $(DESTDIR)$(SBINDIR) $(DESTDIR)$(MAN1DIR) $(DESTDIR)$(MAN7DIR) $(DESTDIR)$(MAN8DIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(INSTALL_PROG) supernode $(DESTDIR)$(SBINDIR)/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(INSTALL_PROG) edge $(DESTDIR)$(SBINDIR)/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(INSTALL_DOC) edge.8.gz $(DESTDIR)$(MAN8DIR)/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(INSTALL_DOC) supernode.1.gz $(DESTDIR)$(MAN1DIR)/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(INSTALL_DOC) n2n.7.gz $(DESTDIR)$(MAN7DIR)/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(MAKE) -C tools install DESTDIR=$(DESTDIR) SBINDIR=$(SBINDIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Docker builder section
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DOCKER_IMAGE_NAME=ntop/supernode
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- tools/Makefile.in.orig 2021-10-27 13:43:08.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tools/Makefile.in 2021-12-21 01:46:27.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -39,4 +39,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rm -f $(TESTS) *.gcno *.gcda
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install: $(TOOLS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(INSTALL_PROG) $(TOOLS) $(SBINDIR)/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(INSTALL_PROG) $(TOOLS) $(DESTDIR)$(SBINDIR)/
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/n2n/files/configure.seed.patch b/net/n2n/files/configure.seed.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ae98eab5903..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/n2n/files/configure.seed.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-MacPorts does not want build systems to look in Homebrew directories.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.seed.orig 2021-10-27 13:43:08.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.seed 2021-12-21 01:12:39.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -54,8 +54,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "x$with_openssl" != xno; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OLD_CFLAGS="${CFLAGS}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OLD_LDFLAGS="${LDFLAGS}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CFLAGS="${CFLAGS} -I/usr/local/opt/openssl@1.1/include"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LDFLAGS="${LDFLAGS} -L/usr/local/opt/openssl@1.1/lib/"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_CHECK_LIB([crypto], [EVP_CIPHER_CTX_reset])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "x$ac_cv_lib_crypto_EVP_CIPHER_CTX_reset" != xyes; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_MSG_RESULT(OpenSSL 1.1 not present)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/n2n/files/no-space-after-L-or-I.patch b/net/n2n/files/no-space-after-L-or-I.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 32de3550c61..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/n2n/files/no-space-after-L-or-I.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Remove space after -L and -I
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/ntop/n2n/pull/974
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.in.orig 2022-03-31 04:16:05.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile.in 2022-03-31 04:16:05.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -18,8 +18,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- export CFLAGS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- export LDFLAGS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--CFLAGS=@CFLAGS@ -I ./include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LDFLAGS=@LDFLAGS@ -L .
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CFLAGS=@CFLAGS@ -I./include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LDFLAGS=@LDFLAGS@ -L.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OPENSSL_CFLAGS=$(shell pkg-config openssl; echo $$?)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifeq ($(OPENSSL_CFLAGS), 0)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/n2n/files/patch-man-prefix.diff b/net/n2n/files/patch-man-prefix.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..8910202a6eb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/n2n/files/patch-man-prefix.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2022-03-31 19:39:11.000000000 +0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2022-09-09 00:55:21.000000000 +0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -306,11 +306,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PROPERTIES GENERATED 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install(FILES ${PROJECT_BINARY_DIR}/doc/edge.8.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DESTINATION /usr/share/man/man8)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DESTINATION @PREFIX@/share/man/man8)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install(FILES ${PROJECT_BINARY_DIR}/doc/supernode.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DESTINATION /usr/share/man/man1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DESTINATION @PREFIX@/share/man/man1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install(FILES ${PROJECT_BINARY_DIR}/doc/n2n.7.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DESTINATION /usr/share/man/man7)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DESTINATION @PREFIX@/share/man/man7)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif(DEFINED UNIX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (CMAKE_SYSTEM_NAME STREQUAL Linux)
</span></pre><pre style='margin:0'>
</pre>