diff --git a/net/miniupnpc/Makefile b/net/miniupnpc/Makefile index 49e3fbb047c4..4bea81666acf 100644 --- a/net/miniupnpc/Makefile +++ b/net/miniupnpc/Makefile @@ -1,37 +1,40 @@ PORTNAME= miniupnpc PORTVERSION= 2.2.6 +PORTREVISION= 1 CATEGORIES?= net MASTER_SITES= http://miniupnp.free.fr/files/ \ https://miniupnp.tuxfamily.org/files/ MAINTAINER?= dinoex@FreeBSD.org COMMENT?= UPnP IGD client lightweight library WWW= http://miniupnp.free.fr/ 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} LIBDIR=lib +MAKE_ARGS+= MANPATH="${PREFIX}/share/man" .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}/bin/upnp-listdevices \ ${STAGEDIR}${PREFIX}/lib/libminiupnpc.so.17 .endif .include 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,31 +1,28 @@ ---- 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 endif -LIBDIR ?= lib # 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 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) 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,17 +1,18 @@ bin/external-ip +bin/upnp-listdevices bin/upnpc include/miniupnpc/igd_desc_parse.h include/miniupnpc/miniupnpc.h include/miniupnpc/miniupnpc_declspec.h include/miniupnpc/miniupnpctypes.h include/miniupnpc/miniwget.h include/miniupnpc/portlistingparse.h include/miniupnpc/upnpcommands.h include/miniupnpc/upnpdev.h include/miniupnpc/upnperrors.h include/miniupnpc/upnpreplyparse.h 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