From nobody Fri Jan 12 20:23:31 2024 X-Original-To: dev-commits-ports-all@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 4TBXzl4PMXz56Gtw; Fri, 12 Jan 2024 20:23:31 +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 4TBXzl2cjRz4L1j; Fri, 12 Jan 2024 20:23:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705091011; 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=M/1jI/UMRE00FXNpkmtRGEwh2NFrG79XKe6SMUozpm8=; b=WjRLNS9VjTy1/YF4e4+A5Z5R80ywwbQUwy5SrQWHzmkbL7gpIvLE8a0npaHCV2A+1NtMzb eV6U+mIlEJtaKD+qYQQ6J6Xn4PioVWZZRBEPYQzE2wvH57s3kCTc/HruEDB/kpZLXVuash gDuMdDtfNHLPxAaZkcqn6aC33ZCul+k6Bii1MAe4slIGRGOXXWmUW2Vk1VRaryf+DhkH3p KxHw27fCIp/HzEn/DjHXrABGK6S83JLsMGFQ0UI2z970HaMfKBX3820Ee9O3Qdylj2oLAY 1jO8e2Zm2SAubgWkLJF/T9uHTEFVC8r0vSOaEtST5kscVJRk5MW7xwgAV9P+ng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705091011; 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=M/1jI/UMRE00FXNpkmtRGEwh2NFrG79XKe6SMUozpm8=; b=xbI5e3k3TeTRxmbMicw0Oo/5rXmXp1V+SCGjOf524fjfZhpnC0NI4ZjSjJ1I9kU2T7vYuN 7tb8TpRSi/HobKIkN4AH5B6M97C+bUeFElou9scEUvWHtil97PXbrxH/xLiw01Qt7IOd3P lTokprO9VN3+ye96/r1Frqwj/eHMpZ/c04QFxBU2PUxsgjpKmOf1BLG/MeHKUody3vhMn9 4qNnqNt4lLf5/MklXpiacCaCBo+dKFNZds3GX4Ou+yZse/UuMGIos5YWOLZEd6zBEafJf6 6sZR4nsLMv0KWQbPHy2Ol+/RvRsTKOdz9/sycyZLB19jIQsPlBbiJAXVX3Xq/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705091011; a=rsa-sha256; cv=none; b=ndEns3Bj051u0OGSh8tcnsTjcgYhOal6LhbValC9eHWBdGH/jqSUyUPb0EoB4ZGFzJaoRF EvNDPb49xEmHZPblrRZfXyUzSyWQw/v4JeGfDHAxHYRHcYdzAwZNHXMeOvOVSGD8eKwFAa 7WF77x7wLMYCIGoZWunCE/mPgWiHujGuzotrKolKwSFpsHfcHtytjyEbdHpy13rvQj/XOB yPr+MzhvJS5f9puYtDZbAZ/TYMV/3xplBb56gU4vlxKWlXT8ir/lC86eYdqSSeCKr6Pp20 4NiU4gRHM8Jl/JOF+cp9qfzt5op2Os0BwoKlfhSkXjOAVKyH3F1gAJCHeW4MRg== 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 4TBXzl1j6Fz1GdC; Fri, 12 Jan 2024 20:23:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40CKNVlt053291; Fri, 12 Jan 2024 20:23:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40CKNVQ4053288; Fri, 12 Jan 2024 20:23:31 GMT (envelope-from git) Date: Fri, 12 Jan 2024 20:23:31 GMT Message-Id: <202401122023.40CKNVQ4053288@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: c5e964088faa - main - net/miniupnpc: use ${PREFIX}/share/man List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: c5e964088faaad1e80e7119b4a8f1c6870fa8fcd Auto-Submitted: auto-generated The branch main has been updated by dinoex: URL: https://cgit.FreeBSD.org/ports/commit/?id=c5e964088faaad1e80e7119b4a8f1c6870fa8fcd commit c5e964088faaad1e80e7119b4a8f1c6870fa8fcd Author: Dirk Meyer AuthorDate: 2024-01-12 20:23:21 +0000 Commit: Dirk Meyer CommitDate: 2024-01-12 20:23:21 +0000 net/miniupnpc: use ${PREFIX}/share/man --- net/miniupnpc/Makefile | 3 +++ net/miniupnpc/files/patch-Makefile | 9 +++------ net/miniupnpc/pkg-plist | 3 ++- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/net/miniupnpc/Makefile b/net/miniupnpc/Makefile index 49e3fbb047c4..4bea81666acf 100644 --- a/net/miniupnpc/Makefile +++ b/net/miniupnpc/Makefile @@ -1,5 +1,6 @@ PORTNAME= miniupnpc PORTVERSION= 2.2.6 +PORTREVISION= 1 CATEGORIES?= net MASTER_SITES= http://miniupnp.free.fr/files/ \ https://miniupnp.tuxfamily.org/files/ @@ -19,6 +20,7 @@ CPE_VENDOR= miniupnp_project CONFIGURE_SCRIPT= updateminiupnpcstrings.sh MAKE_ENV+= INSTALLPREFIX=${PREFIX} LIBDIR=lib +MAKE_ARGS+= MANPATH="${PREFIX}/share/man" .include @@ -31,6 +33,7 @@ USE_RC_SUBR= miniupnpc post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/upnpc \ + ${STAGEDIR}${PREFIX}/bin/upnp-listdevices \ ${STAGEDIR}${PREFIX}/lib/libminiupnpc.so.17 .endif diff --git a/net/miniupnpc/files/patch-Makefile b/net/miniupnpc/files/patch-Makefile index 52eeb0a1b62b..cc50c1a9cf71 100644 --- a/net/miniupnpc/files/patch-Makefile +++ b/net/miniupnpc/files/patch-Makefile @@ -1,4 +1,4 @@ ---- Makefile.orig 2022-10-19 22:49:03 UTC +--- Makefile.orig 2024-01-04 00:43:45 UTC +++ Makefile @@ -147,7 +147,6 @@ TESTIGDDESCPARSE += $(BUILD)/minissdpc.o LIBOBJS += $(BUILD)/minissdpc.o @@ -8,18 +8,15 @@ # install directories ifeq ($(strip $(PREFIX)),) INSTALLPREFIX ?= /usr -@@ -155,9 +154,9 @@ else +@@ -155,7 +154,7 @@ else INSTALLPREFIX ?= $(PREFIX) endif INSTALLDIRINC = $(INSTALLPREFIX)/include/miniupnpc -INSTALLDIRLIB = $(INSTALLPREFIX)/$(LIBDIR) +INSTALLDIRLIB = $(INSTALLPREFIX)/lib INSTALLDIRBIN = $(INSTALLPREFIX)/bin --INSTALLDIRMAN = $(INSTALLPREFIX)/share/man -+INSTALLDIRMAN = $(INSTALLPREFIX)/man + INSTALLDIRMAN = $(INSTALLPREFIX)/share/man PKGCONFIGDIR = $(INSTALLDIRLIB)/pkgconfig - - FILESTOINSTALL = $(LIBRARY) $(EXECUTABLES) @@ -242,7 +241,7 @@ distclean: clean updateversion: include/miniupnpc.h diff --git a/net/miniupnpc/pkg-plist b/net/miniupnpc/pkg-plist index aa25f05f7204..f1f6bc1fe734 100644 --- a/net/miniupnpc/pkg-plist +++ b/net/miniupnpc/pkg-plist @@ -1,4 +1,5 @@ bin/external-ip +bin/upnp-listdevices bin/upnpc include/miniupnpc/igd_desc_parse.h include/miniupnpc/miniupnpc.h @@ -14,4 +15,4 @@ lib/libminiupnpc.a lib/libminiupnpc.so lib/libminiupnpc.so.17 libdata/pkgconfig/miniupnpc.pc -man/man3/miniupnpc.3.gz +share/man/man3/miniupnpc.3.gz