From 034e4a424936d38986cf612a58d3725dc860353e Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Thu, 9 Apr 2020 15:15:09 +0000
Subject: [PATCH] update to libupnp-1.8.7

---
 net/libupnp/Makefile  | 17 ++++++++---------
 net/libupnp/distinfo  |  4 ++--
 net/libupnp/pkg/PLIST |  7 ++++---
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/net/libupnp/Makefile b/net/libupnp/Makefile
index 7720d0717cc..f8405c75d81 100755
--- a/net/libupnp/Makefile
+++ b/net/libupnp/Makefile
@@ -1,16 +1,17 @@
-# $OpenBSD: Makefile,v 1.13 2019/07/12 20:48:31 sthen Exp $
+# $OpenBSD: Makefile,v 1.14 2020/04/09 15:15:09 sthen Exp $
 
 COMMENT=	Universal Plug and Play SDK
 
-DISTNAME=	libupnp-1.8.4
+DISTNAME=	libupnp-1.8.7
 EXTRACT_SUFX=	.tar.bz2
 
 CATEGORIES=	net devel
 
-SHARED_LIBS +=  ixml                 1.0      # 10.1.0
-SHARED_LIBS +=  upnp                 2.0      # 13.0.0
+SHARED_LIBS +=  ixml                 1.0      # 10.2
+SHARED_LIBS +=  upnp                 3.0      # 14.2
 
-HOMEPAGE=	http://pupnp.sourceforge.net/
+# also https://github.com/pupnp/pupnp
+HOMEPAGE=	https://pupnp.sourceforge.io/
 
 # BSD
 PERMIT_PACKAGE=	Yes
@@ -20,14 +21,12 @@ WANTLIB += pthread
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pupnp/}
 
 SEPARATE_BUILD=	Yes
+DEBUG_PACKAGES=	${BUILD_PACKAGES}
+
 CONFIGURE_STYLE= gnu
 # HAVE_COMPAT does not do anything
 CONFIGURE_ENV=	ac_cv_cflags_gcc_option__Os=no \
 		ac_cv_lib_compat_ftime=no
 CONFIGURE_ARGS=	--enable-reuseaddr
 
-.ifdef DEBUG
-CONFIGURE_ARGS+= --enable-debug
-.endif
-
 .include <bsd.port.mk>
diff --git a/net/libupnp/distinfo b/net/libupnp/distinfo
index 4a90d4f059d..ee88548469f 100644
--- a/net/libupnp/distinfo
+++ b/net/libupnp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libupnp-1.8.4.tar.bz2) = GI0/eG2S/hQZHxdjTS2HhH7ufStWilJX6iMmL+yZc9Y=
-SIZE (libupnp-1.8.4.tar.bz2) = 676576
+SHA256 (libupnp-1.8.7.tar.bz2) = 44xpsrZzIuZ81TaA25sCx8H3IKR6PNYm/YnVfS3Kk7g=
+SIZE (libupnp-1.8.7.tar.bz2) = 679613
diff --git a/net/libupnp/pkg/PLIST b/net/libupnp/pkg/PLIST
index 56f2b9a00a6..52d30c478f0 100644
--- a/net/libupnp/pkg/PLIST
+++ b/net/libupnp/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.6 2019/05/06 16:34:44 kn Exp $
+@comment $OpenBSD: PLIST,v 1.7 2020/04/09 15:15:09 sthen Exp $
 include/upnp/
 include/upnp/ActionComplete.h
 include/upnp/ActionRequest.h
@@ -6,6 +6,7 @@ include/upnp/Callback.h
 include/upnp/Discovery.h
 include/upnp/Event.h
 include/upnp/EventSubscribe.h
+include/upnp/ExtraHeaders.h
 include/upnp/FileInfo.h
 include/upnp/StateVarComplete.h
 include/upnp/StateVarRequest.h
@@ -28,10 +29,10 @@ include/upnp/upnp.h
 include/upnp/upnpconfig.h
 include/upnp/upnpdebug.h
 include/upnp/upnptools.h
-lib/libixml.a
+@static-lib lib/libixml.a
 lib/libixml.la
 @lib lib/libixml.so.${LIBixml_VERSION}
-lib/libupnp.a
+@static-lib lib/libupnp.a
 lib/libupnp.la
 @lib lib/libupnp.so.${LIBupnp_VERSION}
 lib/pkgconfig/libupnp.pc