From nobody Mon Feb 07 11:06:49 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 5D48B19A68F7; Mon, 7 Feb 2022 11:06:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JsjyK2Cwjz4sf0; Mon, 7 Feb 2022 11:06:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644232009; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=viRvSetOQmtXgC5ha44mb5+QpziWrKbTcrNnKRpOD18=; b=nS1K8NFurf31vHoESwqCdtpabZlWeqd8EdVrrycx4j599HhLWE8oQdwW19UFYf1NfFAP68 IrT5LrQHpem2aJaU5pdnfeYXXwpmZYsLJ7G7YM9O9UNa+2HnDFUpCmKCgmFuhPsq/rPmrl LmwLwh5oBFDD1CwX2M7SGtfTGj88bbMn7ediltbeq3xc81Vwbkc6lloySSZPNEDqwEH8+9 olis6hnKCSZxD9h4w3PCcwTvF+tmaHWCUmAHUhhKJi4dZnFy6mNDHSdEm9wuSH1FpitNwg bwBjaahwNskLkHW9Av11UYa/bNmQdHPgUeNpb2eZ8U+Ww4V4UpRiyrtn3WxBJw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2829A241FF; Mon, 7 Feb 2022 11:06:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 217B6nho058044; Mon, 7 Feb 2022 11:06:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 217B6nCq058043; Mon, 7 Feb 2022 11:06:49 GMT (envelope-from git) Date: Mon, 7 Feb 2022 11:06:49 GMT Message-Id: <202202071106.217B6nCq058043@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dirk Meyer Subject: git: 529426676b2b - main - net/miniupnpc: Update to 2.2.3 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dinoex X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 529426676b2b44608924d13ec6fc32ea05ec909a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644232009; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=viRvSetOQmtXgC5ha44mb5+QpziWrKbTcrNnKRpOD18=; b=kVZb5+5BkSxdbxl5psUUpqYyR0FmzFuczGmJHZvGXrEfazVyFpmbXgUJIOvy2XwEzyhciO Gcil1QKrHfupzJWGbwM+WFoDBea0B1XESO+//joXv5Aniux9ZH5u8wdA7JVbmDK1pkczsu auyG+vcMsqi6IOx17zjJ3jbOkdbYuA6qzVy22FGk25S7V7jM61dme7lBtn8e98c0s4/KwU tUMQPeH2f4xbI9uRgZfErVL6knTeAzjZQju8wnox/Bt3BFpuZ0nbbGNLeh5fn9WEONp6R9 XIzTWURsL0zt0I7GxD1U0jQIJ2kDcefIlrOKqskIr0jM+KZntKQqAyuEbNhiAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644232009; a=rsa-sha256; cv=none; b=MQKjh+dqMB6wH6V84imK9BasZSW61JWlQRr4axuSZWzs+wkhUctLacS8fcdZiMfpgc8Eum O1Q3WgDTgIro2QDANO1EVhvsodSPhZM5kVt1Xix/SjfHyiXkcDPVARPCtKh1+oQJnDRW2v 9HC2zoU4OQXlQNdFmAnQN/MTbKpbc1EhVReJkOZns8gKdePGWS8rzyiXsR7SZwaJaXIKF6 rmvVpGtCx/I/joxhFj1fGalBToRNsebggJx/xi0BNjj40P8kVdii+t2GzLeBcOgPoo2i49 ER+DvDhF5NKyTApx1wIJf6WQmNNgMHoi5+p1OAIgluefhaDTVAgUF31Czj8VeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dinoex: URL: https://cgit.FreeBSD.org/ports/commit/?id=529426676b2b44608924d13ec6fc32ea05ec909a commit 529426676b2b44608924d13ec6fc32ea05ec909a Author: Dirk Meyer AuthorDate: 2022-02-07 11:06:26 +0000 Commit: Dirk Meyer 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)))