- update to miniupnpc 2.1

PR:		228050
Submitted by:	Hung-Yi Chen

- fix python build
- add LICENSE for slave port
- make portlint happier

- bump PORTREVISION on ports using the shared lib

21 files changed, 36 insertions, 31 deletions

diff --git a/emulators/dolphin-emu/Makefile b/emulators/dolphin-emu/Makefile
index 35dce4bffdb0..7a48b5d72553 100644
--- a/emulators/dolphin-emu/Makefile
+++ b/emulators/dolphin-emu/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	dolphin-emu
 PORTVERSION=	5.0
-PORTREVISION=	19
+PORTREVISION=	20
 CATEGORIES=	emulators
 
 MAINTAINER=	martymac@FreeBSD.org
diff --git a/games/0ad/Makefile b/games/0ad/Makefile
index c43b981e9db2..bcf63f59e4c9 100644
--- a/games/0ad/Makefile
+++ b/games/0ad/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	0ad
 PORTVERSION=	0.0.22
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	games
 MASTER_SITES=	http://releases.wildfiregames.com/ \
 		SF/zero-ad/releases
diff --git a/games/megaglest/Makefile b/games/megaglest/Makefile
index f6a2f2bf2a0a..9c5e0c0d1c24 100644
--- a/games/megaglest/Makefile
+++ b/games/megaglest/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	megaglest
 PORTVERSION=	3.13.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games
 
 MAINTAINER=	monwarez@mailoo.org
diff --git a/games/openclonk/Makefile b/games/openclonk/Makefile
index a48b8cf33e29..abd4ce695f0a 100644
--- a/games/openclonk/Makefile
+++ b/games/openclonk/Makefile
@@ -4,6 +4,7 @@
 PORTNAME=	openclonk
 DISTVERSION=	8.0
 DISTVERSIONSUFFIX=	-src
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.openclonk.org/builds/release/${DISTVERSION}/
 
diff --git a/graphics/drawpile/Makefile b/graphics/drawpile/Makefile
index b0b2688a868f..000c2290d23d 100644
--- a/graphics/drawpile/Makefile
+++ b/graphics/drawpile/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	Drawpile
 DISTVERSION=	2.0.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics python
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/irc/iroffer-dinoex/Makefile b/irc/iroffer-dinoex/Makefile
index 2ad68ba744f0..a0dd8e282e0c 100644
--- a/irc/iroffer-dinoex/Makefile
+++ b/irc/iroffer-dinoex/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	iroffer
 PORTVERSION=	3.30
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	irc
 MASTER_SITES=	http://iroffer.dinoex.net/
 PKGNAMESUFFIX=	-dinoex${PKGNAMESUFFIX2}
diff --git a/net-p2p/bitcoin/Makefile b/net-p2p/bitcoin/Makefile
index 42318af88ed0..fb696dd82824 100644
--- a/net-p2p/bitcoin/Makefile
+++ b/net-p2p/bitcoin/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	bitcoin
 PORTVERSION=	0.16.0
 DISTVERSIONPREFIX=	v
-PORTREVISION?=	2
+PORTREVISION?=	3
 CATEGORIES=	net-p2p finance
 
 MAINTAINER=	kbowling@FreeBSD.org
diff --git a/net-p2p/eiskaltdcpp-lib/Makefile b/net-p2p/eiskaltdcpp-lib/Makefile
index 932fa02b27db..4bf383ee23c3 100644
--- a/net-p2p/eiskaltdcpp-lib/Makefile
+++ b/net-p2p/eiskaltdcpp-lib/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	eiskaltdcpp
 PORTVERSION=	2.2.10
 DISTVERSIONPREFIX=	v
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	net-p2p
 PKGNAMESUFFIX?=	-lib
 
diff --git a/net-p2p/litecoin/Makefile b/net-p2p/litecoin/Makefile
index cd0ee866c5d7..352112841457 100644
--- a/net-p2p/litecoin/Makefile
+++ b/net-p2p/litecoin/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	litecoin
 PORTVERSION=	0.14.2
 DISTVERSIONPREFIX=	v
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	net-p2p finance
 
 PATCH_SITES=	https://github.com/bitcoin/bitcoin/commit/
diff --git a/net-p2p/monero-cli/Makefile b/net-p2p/monero-cli/Makefile
index 7a2e3ac14443..57272b24678e 100644
--- a/net-p2p/monero-cli/Makefile
+++ b/net-p2p/monero-cli/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	monero-cli
 PORTVERSION=	0.12.0.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-p2p finance
 
 MAINTAINER=	vd@FreeBSD.org
diff --git a/net-p2p/qtum/Makefile b/net-p2p/qtum/Makefile
index c91ff3a674a1..f20f7684e77e 100644
--- a/net-p2p/qtum/Makefile
+++ b/net-p2p/qtum/Makefile
@@ -4,6 +4,7 @@
 PORTNAME=	qtum
 PORTVERSION=	0.14.16
 DISTVERSIONPREFIX=	mainnet-ignition-v
+PORTREVISION=	1
 CATEGORIES=	net-p2p finance
 
 MAINTAINER=	vd@FreeBSD.org
diff --git a/net-p2p/transmission-cli/Makefile b/net-p2p/transmission-cli/Makefile
index 86f3493b4198..9bd0618b7f7f 100644
--- a/net-p2p/transmission-cli/Makefile
+++ b/net-p2p/transmission-cli/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	transmission
 PORTVERSION=	2.93
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	net-p2p
 MASTER_SITES=	https://github.com/transmission/transmission-releases/raw/master/ \
 		http://transmission.cachefly.net/
diff --git a/net-p2p/zetacoin/Makefile b/net-p2p/zetacoin/Makefile
index 21b56320c146..3d528bce9ebb 100644
--- a/net-p2p/zetacoin/Makefile
+++ b/net-p2p/zetacoin/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	zetacoin
 PORTVERSION=	0.11.2.3
 DISTVERSIONPREFIX=	v
-PORTREVISION=	16
+PORTREVISION=	17
 CATEGORIES=	net-p2p finance
 
 MAINTAINER=	daniel@morante.net
diff --git a/net/dante/Makefile b/net/dante/Makefile
index f5fbe0b4b105..3ff2d1c879ec 100644
--- a/net/dante/Makefile
+++ b/net/dante/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	dante
 PORTVERSION=	1.4.2
+PORTREVISION=	1
 CATEGORIES=	net security ipv6
 MASTER_SITES=	http://www.inet.no/dante/files/ \
 		ftp://ftp.inet.no/pub/socks/
diff --git a/net/miniupnpc/Makefile b/net/miniupnpc/Makefile
index a539582deb08..1afd649b3201 100644
--- a/net/miniupnpc/Makefile
+++ b/net/miniupnpc/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	miniupnpc
-PORTVERSION=	2.0.20170509
+PORTVERSION=	2.1
 CATEGORIES?=	net
 MASTER_SITES=	http://miniupnp.free.fr/files/
 
@@ -29,7 +29,7 @@ USE_RC_SUBR=	miniupnpc
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/upnpc \
-		${STAGEDIR}${PREFIX}/lib/libminiupnpc.so.16
+		${STAGEDIR}${PREFIX}/lib/libminiupnpc.so.17
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/net/miniupnpc/distinfo b/net/miniupnpc/distinfo
index e25fd166b0c5..3f01b61ad09b 100644
--- a/net/miniupnpc/distinfo
+++ b/net/miniupnpc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495439582
-SHA256 (miniupnpc-2.0.20170509.tar.gz) = d3c368627f5cdfb66d3ebd64ca39ba54d6ff14a61966dbecb8dd296b7039f16a
-SIZE (miniupnpc-2.0.20170509.tar.gz) = 86055
+TIMESTAMP = 1525713119
+SHA256 (miniupnpc-2.1.tar.gz) = e19fb5e01ea5a707e2a8cb96f537fbd9f3a913d53d804a3265e3aeab3d2064c6
+SIZE (miniupnpc-2.1.tar.gz) = 91914
diff --git a/net/miniupnpc/files/patch-Makefile b/net/miniupnpc/files/patch-Makefile
index 8227073c187a..4c56084ad370 100644
--- a/net/miniupnpc/files/patch-Makefile
+++ b/net/miniupnpc/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	2016-12-16 10:04:32.000000000 +0100
-+++ Makefile	2016-12-25 20:17:08.952901000 +0100
-@@ -141,7 +141,6 @@
+--- Makefile.orig	2018-04-06 10:53:30 UTC
++++ Makefile
+@@ -139,7 +139,6 @@ TESTMINIWGETOBJS := $(TESTMINIWGETOBJS) 
  TESTIGDDESCPARSE := $(TESTIGDDESCPARSE) minissdpc.o
  endif
  
@@ -8,7 +8,7 @@
  # install directories
  ifeq ($(strip $(PREFIX)),)
  INSTALLPREFIX ?= /usr
-@@ -149,9 +148,9 @@
+@@ -147,9 +146,9 @@ else
  INSTALLPREFIX ?= $(PREFIX)
  endif
  INSTALLDIRINC = $(INSTALLPREFIX)/include/miniupnpc
@@ -17,6 +17,6 @@
  INSTALLDIRBIN = $(INSTALLPREFIX)/bin
 -INSTALLDIRMAN = $(INSTALLPREFIX)/share/man
 +INSTALLDIRMAN = $(INSTALLPREFIX)/man
+ PKGCONFIGDIR = $(INSTALLDIRLIB)/pkgconfig
  
  FILESTOINSTALL = $(LIBRARY) $(EXECUTABLES)
- ifneq ($(OS), AmigaOS)
diff --git a/net/miniupnpc/files/patch-setup.py b/net/miniupnpc/files/patch-setup.py
index fba42130e14c..adb7ec35fb42 100644
--- a/net/miniupnpc/files/patch-setup.py
+++ b/net/miniupnpc/files/patch-setup.py
@@ -1,10 +1,10 @@
---- setup.py.orig	2018-01-06 09:33:40 UTC
+--- setup.py.orig	2017-11-02 17:38:01 UTC
 +++ setup.py
-@@ -23,6 +23,6 @@ setup(name="miniupnpc",
-       description='miniUPnP client',
+@@ -30,6 +30,6 @@ setup(name="miniupnpc",
+       cmdclass={'build_ext': make_then_build_ext},
        ext_modules=[
           Extension(name="miniupnpc", sources=["miniupnpcmodule.c"],
--                   extra_objects=["libminiupnpc.a"])
+-                   extra_objects=EXT)
 +                   libraries=["miniupnpc"])
        ])
  
diff --git a/net/miniupnpc/pkg-plist b/net/miniupnpc/pkg-plist
index fa36d33a8647..6e538fc7d734 100644
--- a/net/miniupnpc/pkg-plist
+++ b/net/miniupnpc/pkg-plist
@@ -12,5 +12,5 @@ include/miniupnpc/upnperrors.h
 include/miniupnpc/upnpreplyparse.h
 lib/libminiupnpc.a
 lib/libminiupnpc.so
-lib/libminiupnpc.so.16
+lib/libminiupnpc.so.17
 man/man3/miniupnpc.3.gz
diff --git a/net/py-miniupnpc/Makefile b/net/py-miniupnpc/Makefile
index 9e9a1b9201c3..57782d20c410 100644
--- a/net/py-miniupnpc/Makefile
+++ b/net/py-miniupnpc/Makefile
@@ -1,19 +1,21 @@
 # $FreeBSD$
 
 CATEGORIES=	net python
-PORTREVISION=	1
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 COMMENT=	Python module for miniupnpc
 
-LIB_DEPENDS=	libminiupnpc.so:net/miniupnpc
+LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+LIB_DEPENDS=	libminiupnpc.so:${PKGCATEGORY}/miniupnpc
 
 MASTERDIR=	${.CURDIR}/../miniupnpc
 
 USES=		python
 USE_PYTHON=	autoplist distutils
-
-PLIST=		${.CURDIR}/pkg-plist
+MAKE_ENV=	MAKE=gmake
+PLIST=
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/miniupnpc.so
diff --git a/security/i2pd/Makefile b/security/i2pd/Makefile
index b2e27a59a40a..84d214f2dfb3 100644
--- a/security/i2pd/Makefile
+++ b/security/i2pd/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	i2pd
 PORTVERSION=	2.18.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security net-p2p
 
 MAINTAINER=	amdmi3@FreeBSD.org