diff --git a/net/miniupnpc/Makefile b/net/miniupnpc/Makefile index 027b50e8259d..bd274f3f51cb 100644 --- a/net/miniupnpc/Makefile +++ b/net/miniupnpc/Makefile @@ -1,36 +1,36 @@ PORTNAME= miniupnpc -PORTVERSION= 2.2.2 +PORTVERSION= 2.2.3 PORTREVISION= 0 CATEGORIES?= net MASTER_SITES= http://miniupnp.free.fr/files/ MAINTAINER?= dinoex@FreeBSD.org COMMENT?= UPnP IGD client lightweight library LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE USES+= cpe gmake HAS_CONFIGURE= yes USE_LDCONFIG= yes CPE_VENDOR= miniupnp_project CONFIGURE_SCRIPT= updateminiupnpcstrings.sh MAKE_ENV+= INSTALLPREFIX=${PREFIX} .include .if defined(WITH_DEBUG) CFLAGS+= -DDEBUG .endif .if ${SLAVE_PORT} == no USE_RC_SUBR= miniupnpc post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/upnpc \ ${STAGEDIR}${PREFIX}/lib/libminiupnpc.so.17 .endif .include 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,31 +1,57 @@ ---- 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 -INSTALLDIRLIB = $(INSTALLPREFIX)/$(LIBDIR) +INSTALLDIRLIB = $(INSTALLPREFIX)/lib INSTALLDIRBIN = $(INSTALLPREFIX)/bin -INSTALLDIRMAN = $(INSTALLPREFIX)/share/man +INSTALLDIRMAN = $(INSTALLPREFIX)/man 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)))