Date: Fri, 12 Jan 2024 20:23:31 GMT
From: Dirk Meyer <dinoex@FreeBSD.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject: git: c5e964088faa - main - net/miniupnpc: use ${PREFIX}/share/man
Message-ID: <202401122023.40CKNVQ4053288@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by dinoex: URL: https://cgit.FreeBSD.org/ports/commit/?id=c5e964088faaad1e80e7119b4a8f1c6870fa8fcd commit c5e964088faaad1e80e7119b4a8f1c6870fa8fcd Author: Dirk Meyer <dinoex@FreeBSD.org> AuthorDate: 2024-01-12 20:23:21 +0000 Commit: Dirk Meyer <dinoex@FreeBSD.org> 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 <bsd.port.pre.mk> @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202401122023.40CKNVQ4053288>