<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ad69222b4863f9197039a442dec0d0fbba83b79c">https://github.com/macports/macports-ports/commit/ad69222b4863f9197039a442dec0d0fbba83b79c</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit ad69222b4863f9197039a442dec0d0fbba83b79c
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Tue Dec 21 02:00:03 2021 -0600
<span style='display:block; white-space:pre;color:#404040;'> n2n: Update to 3.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/58386
</span>---
net/n2n/Portfile | 43 +++++++++++++++++++++++-----------
net/n2n/files/DESTDIR.patch | 48 ++++++++++++++++++++++++++++++++++++++
net/n2n/files/configure.seed.patch | 12 ++++++++++
net/n2n/files/patch-Makefile.diff | 28 ----------------------
4 files changed, 89 insertions(+), 42 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 47fb05f8701..562f56befca 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,31 +1,46 @@
</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 github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup openssl 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup ntop n2n 3.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 7bd54afd91bb0dce2fc033ba82873d7c6f76190a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 25fcabba7bfcf25f4c9cd7fecc7ce11de48beb0b0f3506053d8485604ea8f50d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 478311
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name n2n
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.3.2
</span> categories net
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0ffe0;'>+license GPL-3+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> description a layer 2 p2p vpn
long_description n2n is a layer-two peer-to-peer virtual private network \
(VPN) which allows users to exploit features typical of \
P2P applications at network instead of application level.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://www.ntop.org/n2n/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-fetch.type svn
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-svn.url https://svn.ntop.org/svn/ntop/trunk/n2n
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-svn.revision 3938
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://www.ntop.org/n2n/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from archive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+openssl.branch 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# No configure script in tarball.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_autoreconf yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+autoreconf.cmd ./autogen.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+autoreconf.args
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:autoconf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:automake \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libtool
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:zstd
</span>
depends_run port:tuntaposx
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_configure no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles configure.seed.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DESTDIR.patch
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-worksrcdir n2n
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args --with-openssl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-zstd
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args CC="${configure.cc}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DEBUG="" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OPTIONS="${configure.cflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PLATOPTS="${configure.cc_archflags}"
</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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..c08720747de
</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/DESTDIR.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,48 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Use correct default for PREFIX and support DESTDIR properly.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.in.orig 2021-10-27 13:43:08.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile.in 2021-12-21 01:56:36.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -66,13 +66,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INSTALL_PROG=$(INSTALL) -m755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INSTALL_DOC=$(INSTALL) -m644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# DESTDIR set in debian make system
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-PREFIX?=$(DESTDIR)/usr
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ifeq ($(CONFIG_TARGET),darwin)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-SBINDIR=$(PREFIX)/local/sbin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++PREFIX?=/usr/local
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SBINDIR=$(PREFIX)/sbin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MANDIR?=$(PREFIX)/share/man
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MAN1DIR=$(MANDIR)/man1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -238,14 +233,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rm -f $(addprefix src/,$(APPS))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install: edge supernode edge.8.gz supernode.1.gz n2n.7.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo "MANDIR=$(MANDIR)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(MKDIR) $(SBINDIR) $(MAN1DIR) $(MAN7DIR) $(MAN8DIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(INSTALL_PROG) supernode $(SBINDIR)/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(INSTALL_PROG) edge $(SBINDIR)/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(INSTALL_DOC) edge.8.gz $(MAN8DIR)/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(INSTALL_DOC) supernode.1.gz $(MAN1DIR)/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(INSTALL_DOC) n2n.7.gz $(MAN7DIR)/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(MAKE) -C tools install SBINDIR=$(abspath $(SBINDIR))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(MKDIR) $(DESTDIR)$(SBINDIR) $(DESTDIR)$(MAN1DIR) $(DESTDIR)$(MAN7DIR) $(DESTDIR)$(MAN8DIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(INSTALL_PROG) supernode $(DESTDIR)$(SBINDIR)/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(INSTALL_PROG) edge $(DESTDIR)$(SBINDIR)/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(INSTALL_DOC) edge.8.gz $(DESTDIR)$(MAN8DIR)/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(INSTALL_DOC) supernode.1.gz $(DESTDIR)$(MAN1DIR)/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(INSTALL_DOC) n2n.7.gz $(DESTDIR)$(MAN7DIR)/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(MAKE) -C tools install DESTDIR=$(DESTDIR) SBINDIR=$(SBINDIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Docker builder section
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DOCKER_IMAGE_NAME=ntop/supernode
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tools/Makefile.in.orig 2021-10-27 13:43:08.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tools/Makefile.in 2021-12-21 01:46:27.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -39,4 +39,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rm -f $(TESTS) *.gcno *.gcda
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install: $(TOOLS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(INSTALL_PROG) $(TOOLS) $(SBINDIR)/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..ae98eab5903
</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/configure.seed.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+MacPorts does not want build systems to look in Homebrew directories.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.seed.orig 2021-10-27 13:43:08.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.seed 2021-12-21 01:12:39.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -54,8 +54,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "x$with_openssl" != xno; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OLD_CFLAGS="${CFLAGS}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OLD_LDFLAGS="${LDFLAGS}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CFLAGS="${CFLAGS} -I/usr/local/opt/openssl@1.1/include"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LDFLAGS="${LDFLAGS} -L/usr/local/opt/openssl@1.1/lib/"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_CHECK_LIB([crypto], [EVP_CIPHER_CTX_reset])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "x$ac_cv_lib_crypto_EVP_CIPHER_CTX_reset" != xyes; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_RESULT(OpenSSL 1.1 not present)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/n2n/files/patch-Makefile.diff b/net/n2n/files/patch-Makefile.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 86c757ee5e9..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/n2n/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,28 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile (revision 3938)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile (working copy)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -20,12 +20,11 @@
</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;'>--
</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;'>--BINDIR=$(PREFIX)/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--SBINDIR=$(PREFIX)/sbin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--MANDIR?=$(PREFIX)/share/man
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+PREFIX?=/usr
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+BINDIR=$(DESTDIR)$(PREFIX)/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+SBINDIR=$(DESTDIR)$(PREFIX)/sbin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+MANDIR?=$(DESTDIR)$(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;'>- MAN8DIR=$(MANDIR)/man8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -73,4 +72,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Courtesy of Ole Tange <ole@tange.dk>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- deb:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- dpkg-buildpackage
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-\ No newline at end of file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ dpkg-buildpackage
</span></pre><pre style='margin:0'>
</pre>