git: 529426676b2b - main - net/miniupnpc: Update to 2.2.3
- Reply: Jan Beich : "Re: git: 529426676b2b - main - net/miniupnpc: Update to 2.2.3"
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 07 Feb 2022 11:06:49 UTC
The branch main has been updated by dinoex:
URL: https://cgit.FreeBSD.org/ports/commit/?id=529426676b2b44608924d13ec6fc32ea05ec909a
commit 529426676b2b44608924d13ec6fc32ea05ec909a
Author: Dirk Meyer <dinoex@FreeBSD.org>
AuthorDate: 2022-02-07 11:06:26 +0000
Commit: Dirk Meyer <dinoex@FreeBSD.org>
CommitDate: 2022-02-07 11:06:26 +0000
net/miniupnpc: Update to 2.2.3
---
net/miniupnpc/Makefile | 2 +-
net/miniupnpc/distinfo | 6 +++---
net/miniupnpc/files/patch-Makefile | 44 ++++++++++++++++++++++++++++++--------
3 files changed, 39 insertions(+), 13 deletions(-)
diff --git a/net/miniupnpc/Makefile b/net/miniupnpc/Makefile
index 027b50e8259d..bd274f3f51cb 100644
--- a/net/miniupnpc/Makefile
+++ b/net/miniupnpc/Makefile
@@ -1,5 +1,5 @@
PORTNAME= miniupnpc
-PORTVERSION= 2.2.2
+PORTVERSION= 2.2.3
PORTREVISION= 0
CATEGORIES?= net
MASTER_SITES= http://miniupnp.free.fr/files/
diff --git a/net/miniupnpc/distinfo b/net/miniupnpc/distinfo
index a78cefe090d1..2a139563ebee 100644
--- a/net/miniupnpc/distinfo
+++ b/net/miniupnpc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639945958
-SHA256 (miniupnpc-2.2.2.tar.gz) = 888fb0976ba61518276fe1eda988589c700a3f2a69d71089260d75562afd3687
-SIZE (miniupnpc-2.2.2.tar.gz) = 100008
+TIMESTAMP = 1644226514
+SHA256 (miniupnpc-2.2.3.tar.gz) = dce41b4a4f08521c53a0ab163ad2007d18b5e1aa173ea5803bd47a1be3159c24
+SIZE (miniupnpc-2.2.3.tar.gz) = 101360
diff --git a/net/miniupnpc/files/patch-Makefile b/net/miniupnpc/files/patch-Makefile
index 736b53ea967e..0e4fa4af58ca 100644
--- a/net/miniupnpc/files/patch-Makefile
+++ b/net/miniupnpc/files/patch-Makefile
@@ -1,14 +1,14 @@
---- Makefile.orig 2018-04-06 10:53:30 UTC
+--- Makefile.orig 2021-09-28 21:11:31 UTC
+++ Makefile
-@@ -139,7 +139,6 @@ TESTMINIWGETOBJS := $(TESTMINIWGETOBJS)
- TESTIGDDESCPARSE := $(TESTIGDDESCPARSE) minissdpc.o
+@@ -147,7 +147,6 @@ TESTIGDDESCPARSE += $(BUILD)/minissdpc.o
+ LIBOBJS += $(BUILD)/minissdpc.o
endif
-LIBDIR ?= lib
# install directories
ifeq ($(strip $(PREFIX)),)
INSTALLPREFIX ?= /usr
-@@ -147,9 +146,9 @@ else
+@@ -155,14 +154,14 @@ else
INSTALLPREFIX ?= $(PREFIX)
endif
INSTALLDIRINC = $(INSTALLPREFIX)/include/miniupnpc
@@ -20,12 +20,38 @@
PKGCONFIGDIR = $(INSTALLDIRLIB)/pkgconfig
FILESTOINSTALL = $(LIBRARY) $(EXECUTABLES)
-@@ -229,7 +228,7 @@ distclean: clean
+ ifeq (, $(findstring amiga, $(OS)))
+-FILESTOINSTALL += $(SHAREDLIBRARY) miniupnpc.pc
++FILESTOINSTALL += $(SHAREDLIBRARY) $(BUILD)/miniupnpc.pc
+ endif
+
+
+@@ -242,7 +241,7 @@ distclean: clean
- updateversion: miniupnpc.h
- cp miniupnpc.h miniupnpc.h.bak
-- sed 's/\(.*MINIUPNPC_API_VERSION\s\+\)[0-9]\+/\1$(APIVERSION)/' < miniupnpc.h.bak > miniupnpc.h
-+ sed -E 's/(.*MINIUPNPC_API_VERSION[[:space:]]+)[0-9]+/\1$(APIVERSION)/' < miniupnpc.h.bak > miniupnpc.h
+ updateversion: include/miniupnpc.h
+ cp $< $<.bak
+- sed 's/\(.*MINIUPNPC_API_VERSION\s\+\)[0-9]\+/\1$(APIVERSION)/' < $<.bak > $<
++ sed -E 's/(.*MINIUPNPC_API_VERSION[[:space:]]+)[0-9]+/\1$(APIVERSION)/' < $<.bak > $<
install: updateversion $(FILESTOINSTALL)
$(INSTALL) -d $(DESTDIR)$(INSTALLDIRINC)
+@@ -251,15 +250,15 @@ install: updateversion $(FILESTOINSTALL)
+ $(INSTALL) -m 644 $(LIBRARY) $(DESTDIR)$(INSTALLDIRLIB)
+ ifeq (, $(findstring amiga, $(OS)))
+ $(INSTALL) -m 644 $(SHAREDLIBRARY) $(DESTDIR)$(INSTALLDIRLIB)/$(SONAME)
+- ln -fs $(SONAME) $(DESTDIR)$(INSTALLDIRLIB)/$(SHAREDLIBRARY)
++ ln -fs $(SONAME) $(DESTDIR)$(INSTALLDIRLIB)/libminiupnpc.so
+ $(INSTALL) -d $(DESTDIR)$(PKGCONFIGDIR)
+- $(INSTALL) -m 644 miniupnpc.pc $(DESTDIR)$(PKGCONFIGDIR)
++ $(INSTALL) -m 644 $(BUILD)/miniupnpc.pc $(DESTDIR)$(PKGCONFIGDIR)
+ endif
+ $(INSTALL) -d $(DESTDIR)$(INSTALLDIRBIN)
+ ifneq (, $(findstring amiga, $(OS)))
+- $(INSTALL) -m 755 upnpc-static $(DESTDIR)$(INSTALLDIRBIN)/upnpc
++ $(INSTALL) -m 755 $(BUILD)/upnpc-static $(DESTDIR)$(INSTALLDIRBIN)/upnpc
+ else
+- $(INSTALL) -m 755 upnpc-shared $(DESTDIR)$(INSTALLDIRBIN)/upnpc
++ $(INSTALL) -m 755 $(BUILD)/upnpc-shared $(DESTDIR)$(INSTALLDIRBIN)/upnpc
+ endif
+ $(INSTALL) -m 755 external-ip.sh $(DESTDIR)$(INSTALLDIRBIN)/external-ip
+ ifeq (, $(findstring amiga, $(OS)))