<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c452bc25ccdb88ba5fc9eba775f53f395ae40489">https://github.com/macports/macports-ports/commit/c452bc25ccdb88ba5fc9eba775f53f395ae40489</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 c452bc25ccd miniupnpc: install .pc file and fix tests
</span>c452bc25ccd is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c452bc25ccdb88ba5fc9eba775f53f395ae40489
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Thu May 19 02:58:53 2022 +1000
<span style='display:block; white-space:pre;color:#404040;'> miniupnpc: install .pc file and fix tests
</span>---
net/miniupnpc/Portfile | 22 ++++++--------
net/miniupnpc/files/568.patch | 51 +++++++++++++++++++++++++++++++++
net/miniupnpc/files/patch-includes.diff | 31 --------------------
3 files changed, 60 insertions(+), 44 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/miniupnpc/Portfile b/net/miniupnpc/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 467b1a48eb9..bdd6579e460 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/miniupnpc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/miniupnpc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +1,11 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup cmake 1.1
</span>
name miniupnpc
epoch 2
version 2.2.3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories net
platforms darwin freebsd
license BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,22 +20,19 @@ checksums rmd160 22e2a0a442114be25588be99d889a0831fba13f2 \
</span> sha256 dce41b4a4f08521c53a0ab163ad2007d18b5e1aa173ea5803bd47a1be3159c24 \
size 101360
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-includes.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles 568.patch
</span>
variant universal {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-build {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args INSTALLPREFIX=${prefix} CC="${configure.cc} ${configure.cflags} [get_canonical_archflags cc]"
</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:#e0ffe0;'>+use_configure no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env PREFIX=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=${configure.cflags} [get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.env PREFIX=${prefix}
</span> test.run yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.args INSTALLPREFIX=${prefix} CC="${configure.cc} ${configure.cflags} [get_canonical_archflags cc]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> variant debug description {Build MiniUPnP client with DEBUG options, thus dumping SOAP calls} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cflags-append -DDEBUG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append CPPFLAGS=-DDEBUG
</span> }
livecheck.type regex
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/miniupnpc/files/568.patch b/net/miniupnpc/files/568.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..d8c1a19b9be
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/miniupnpc/files/568.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,51 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From ed1dc4bb5cdc4a53963f3eb01089289e30acc5a3 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 29 Sep 2021 08:28:27 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Makefile: fix install rules to account for $(BUILD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix missing references to $(BUILD) in the install rules, as well
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+as incorrect shared library symlink name. Otherwise, the 'install'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+phase fails either being unable to find files:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ make: *** No rule to make target 'miniupnpc.pc', needed by 'install'. Stop.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+or trying to create the symlink in the wrong subdirectory:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln: failed to create symbolic link '/tmp/z/usr/lib/build/libminiupnpc.so': No such file or directory
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ miniupnpc/Makefile | 10 +++++-----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 5 insertions(+), 5 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/miniupnpc/Makefile b/miniupnpc/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 4563b283..11a17f95 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -162,7 +162,7 @@ PKGCONFIGDIR = $(INSTALLDIRLIB)/pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FILESTOINSTALL = $(LIBRARY) $(EXECUTABLES)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq (, $(findstring amiga, $(OS)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-FILESTOINSTALL += $(SHAREDLIBRARY) miniupnpc.pc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++FILESTOINSTALL += $(SHAREDLIBRARY) $(BUILD)/miniupnpc.pc
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -251,15 +251,15 @@ install: updateversion $(FILESTOINSTALL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(INSTALL) -m 644 $(LIBRARY) $(DESTDIR)$(INSTALLDIRLIB)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq (, $(findstring amiga, $(OS)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(INSTALL) -m 644 $(SHAREDLIBRARY) $(DESTDIR)$(INSTALLDIRLIB)/$(SONAME)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ln -fs $(SONAME) $(DESTDIR)$(INSTALLDIRLIB)/$(SHAREDLIBRARY)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ln -fs $(SONAME) $(DESTDIR)$(INSTALLDIRLIB)/$(notdir $(SHAREDLIBRARY))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(INSTALL) -d $(DESTDIR)$(PKGCONFIGDIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(INSTALL) -m 644 miniupnpc.pc $(DESTDIR)$(PKGCONFIGDIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(INSTALL) -m 644 $(BUILD)/miniupnpc.pc $(DESTDIR)$(PKGCONFIGDIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(INSTALL) -d $(DESTDIR)$(INSTALLDIRBIN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifneq (, $(findstring amiga, $(OS)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(INSTALL) -m 755 upnpc-static $(DESTDIR)$(INSTALLDIRBIN)/upnpc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(INSTALL) -m 755 $(BUILD)/upnpc-static $(DESTDIR)$(INSTALLDIRBIN)/upnpc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(INSTALL) -m 755 upnpc-shared $(DESTDIR)$(INSTALLDIRBIN)/upnpc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(INSTALL) -m 755 $(BUILD)/upnpc-shared $(DESTDIR)$(INSTALLDIRBIN)/upnpc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(INSTALL) -m 755 external-ip.sh $(DESTDIR)$(INSTALLDIRBIN)/external-ip
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq (, $(findstring amiga, $(OS)))
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/miniupnpc/files/patch-includes.diff b/net/miniupnpc/files/patch-includes.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index cb910d093e6..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/miniupnpc/files/patch-includes.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,31 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# From upstream commit: https://github.com/miniupnp/miniupnp/commit/f82b0563a72e33800f5918ead68c41bcda1fd4c1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig 2021-09-29 05:41:25.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2022-04-03 16:22:16.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -221,16 +221,16 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (NOT UPNPC_NO_INSTALL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install (FILES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- miniupnpc.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- miniwget.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- upnpcommands.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- igd_desc_parse.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- upnpreplyparse.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- upnperrors.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- upnpdev.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- miniupnpctypes.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- portlistingparse.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- miniupnpc_declspec.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ include/miniupnpc.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ include/miniwget.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ include/upnpcommands.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ include/igd_desc_parse.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ include/upnpreplyparse.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ include/upnperrors.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ include/upnpdev.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ include/miniupnpctypes.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ include/portlistingparse.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ include/miniupnpc_declspec.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DESTINATION include/miniupnpc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>