Index: upnp/Makefile
===================================================================
--- upnp/Makefile	(revision 497500)
+++ upnp/Makefile	(working copy)
@@ -1,45 +1,76 @@
 # Created by: Yen-Ming Lee <leeym@leeym.com>
 # $FreeBSD$
 
-PORTNAME=	upnp
-PORTVERSION=	1.6.25
-PORTEPOCH=	1
-CATEGORIES=	devel
-MASTER_SITES=	SF/p${PORTNAME}/p${PORTNAME}/libUPnP%20${PORTVERSION}
-DISTNAME=	lib${PORTNAME}-${PORTVERSION}
+PORTNAME=		upnp
+DISTVERSIONPREFIX=	release-
+DISTVERSION?=		1.6.25
+PORTEPOCH?=		1
+CATEGORIES=		devel
 
 MAINTAINER=	phascolarctos@protonmail.ch
 COMMENT=	Universal Plug and Play Software Development Kit
 
 LICENSE=	BSD3CLAUSE
-LICENSE_FILE=	${WRKSRC}/LICENSE
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		cpe libtool pathfix tar:bzip2
+USES=		autoreconf cpe libtool pathfix tar:bzip2
 USE_LDCONFIG=	yes
+USE_GITHUB=	yes
 
-PORTSCOUT=	skipv:1.8.3	# released on 2017-11-14; older than 1.6.25
+GH_ACCOUNT=	mrjimenez
+GH_PROJECT=	pupnp
 
-GNU_CONFIGURE=	yes
-INSTALL_TARGET=	install-strip
-TEST_TARGET=	check
-CPE_VENDOR=	libupnp_project
-CPE_PRODUCT=	libupnp
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--enable-device --enable-gena --enable-soap --enable-ssdp --enable-webserver
+INSTALL_TARGET=		install-strip
+TEST_TARGET=		check
+CPE_VENDOR=		libupnp_project
+CPE_PRODUCT=		libupnp
 
 PORTDOCS=	ixml/*.html upnp/*.html
+PORTSCOUT=	limit:^1\.6\.	# tracks only 1.6.*: 1.8.x are also release but they break the ABI so they are tracked in another port (devel/upnp18)
 
-OPTIONS_DEFINE=	DEBUG DOCS IPV6
+OPTIONS_DEFINE=		CLIENT DEBUG DOCS EXAMPLES IPV6 LARGEFILE OPENSSL OPTSSDP POSTWRITE REUSEADDR SCRIPTSUPPORT TCP_BLOCK TEST TOOLS UNSPECIFIED_SERVER
+OPTIONS_DEFAULT=	CLIENT LARGEFILE OPTSSDP REUSEADDR SCRIPTSUPPORT TCP_BLOCK TOOLS
 OPTIONS_SUB=	yes
 
-DEBUG_CONFIGURE_ENABLE=	debug
-DOCS_CONFIGURE_WITH=	documentation=${DOCSDIR}
-IPV6_CONFIGURE_ENABLE=	ipv6
+CLIENT_DESC=			Enable control point code
+CLIENT_CONFIGURE_ENABLE=	client
+DEBUG_CONFIGURE_ENABLE=		debug
+EXAMPLES_CONFIGURE_ENABLE=	samples
+IPV6_CONFIGURE_ENABLE=		ipv6
+LARGEFILE_DESC=			Large files support
+LARGEFILE_CONFIGURE_ENABLE=	largefile
+OPENSSL_CONFIGURE_ENABLE=	open_ssl
+OPENSSL_USES=			ssl
+OPENSSL_LDFLAGS=		-lssl
+OPTSSDP_DESC=			Enable optional SSDP headers support
+OPTSSDP_CONFIGURE_ENABLE=	optssdp
+POSTWRITE_DESC=			Write to filesystem on unhandled POST requests
+POSTWRITE_CONFIGURE_ENABLE=	postwrite
+REUSEADDR_DESC=			Bind miniserver socket with reuseaddr
+REUSEADDR_CONFIGURE_ENABLE=	reuseaddr
+SCRIPTSUPPORT_DESC=		Enable script support for IXML document tree
+SCRIPTSUPPORT_CONFIGURE_ENABLE=	scriptsupport
+TCP_BLOCK_DESC=			Enable blocking TCP connections
+TCP_BLOCK_CONFIGURE_ENABLE=	blocking_tcp_connections
+TEST_DESC=			Perfom a few tests (implies TOOLS)
+TEST_IMPLIES=			TOOLS
+TOOLS_DESC=			Enable helpers API in upnptools.h
+TOOLS_CONFIGURE_ENABLE=		tools
+UNSPECIFIED_SERVER_DESC=	Enable unspecified SERVER header
+UNSPECIFIED_SERVER_CONFIGURE_ENABLE=	unspecified_server
 
-pre-configure:
-	${REINPLACE_CMD} -e '386s,docs/dist,,' ${WRKSRC}/Makefile.in
+post-build-TEST-on: test
 
 do-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+.ifndef PKGNAMESUFFIX
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/docs/dist/html && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
 	${RM} -r ${STAGEDIR}${DOCSDIR}/examples
+.else
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/upnp/doc/UPnP_Programming_Guide.pdf ${STAGEDIR}${DOCSDIR}
+.endif
 
 .include <bsd.port.mk>
Index: upnp/distinfo
===================================================================
--- upnp/distinfo	(revision 497500)
+++ upnp/distinfo	(working copy)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1534737656
-SHA256 (libupnp-1.6.25.tar.bz2) = c5a300b86775435c076d58a79cc0d5a977d76027d2a7d721590729b7f369fa43
-SIZE (libupnp-1.6.25.tar.bz2) = 722731
+TIMESTAMP = 1550252890
+SHA256 (mrjimenez-pupnp-release-1.6.25_GH0.tar.gz) = a7b746064b799e412e25d3e10a3b157620b427e7244e4a66bc0984bd5a4a6d20
+SIZE (mrjimenez-pupnp-release-1.6.25_GH0.tar.gz) = 506543