Update libupnp to 1.6.17.

* IPv6 support (introduce some API/ABI incompatibility).
* many bug fixes,

12 files changed, 292 insertions, 439 deletions

diff --git a/net/libupnp/Makefile b/net/libupnp/Makefile
index 685b8257467..53a25cfe7b9 100644
--- a/net/libupnp/Makefile
+++ b/net/libupnp/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2009/08/08 07:35:54 obache Exp $
+# $NetBSD: Makefile,v 1.17 2012/04/13 23:38:34 obache Exp $
 #
 
-DISTNAME=		libupnp-1.6.6
-PKGREVISION=		2
+DISTNAME=		libupnp-1.6.17
 CATEGORIES=		net
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=pupnp/}
 EXTRACT_SUFX=		.tar.bz2
@@ -12,6 +11,8 @@ HOMEPAGE=		http://pupnp.sourceforge.net/
 COMMENT=		Portable Universal Plug and Play (UPnP) SDK
 LICENSE=		modified-bsd
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_LANGUAGES=		c
 USE_TOOLS+=		pkg-config
 USE_LIBTOOL=		yes
@@ -21,17 +22,9 @@ CONFIGURE_ARGS+=	--with-documentation
 
 PKGCONFIG_OVERRIDE+=	libupnp.pc.in
 
-BUILDLINK_TRANSFORM+=	rm:-lcompat
-
-PKG_DESTDIR_SUPPORT=	user-destdir
-
 TEST_TARGET=		check
 
-.include "../../mk/bsd.prefs.mk"
-.include "../../mk/pthread.buildlink3.mk"
-
-.if ${OPSYS} == "NetBSD" && exists(/usr/include/sys/pset.h)
-PTHREAD_LIBS+=		-lrt
-.endif
+.include "options.mk"
 
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/libupnp/PLIST b/net/libupnp/PLIST
index 77fe2dc4d07..f892cf78079 100644
--- a/net/libupnp/PLIST
+++ b/net/libupnp/PLIST
@@ -1,10 +1,17 @@
-@comment $NetBSD: PLIST,v 1.7 2009/06/14 18:09:33 joerg Exp $
+@comment $NetBSD: PLIST,v 1.8 2012/04/13 23:38:34 obache Exp $
 include/upnp/FreeList.h
 include/upnp/LinkedList.h
 include/upnp/ThreadPool.h
 include/upnp/TimerThread.h
+include/upnp/UpnpGlobal.h
+include/upnp/UpnpInet.h
+include/upnp/UpnpIntTypes.h
+include/upnp/UpnpStdInt.h
+include/upnp/UpnpString.h
+include/upnp/UpnpUniStd.h
 include/upnp/ithread.h
 include/upnp/ixml.h
+include/upnp/ixmldebug.h
 include/upnp/upnp.h
 include/upnp/upnpconfig.h
 include/upnp/upnpdebug.h
@@ -13,263 +20,256 @@ lib/libixml.la
 lib/libthreadutil.la
 lib/libupnp.la
 lib/pkgconfig/libupnp.pc
-share/doc/${PKGBASE}-${PKGVERSION}/UPnP_Programming_Guide.pdf
-share/doc/${PKGBASE}-${PKGVERSION}/IXML_Programming_Guide.pdf
-share/doc/${PKGBASE}-${PKGVERSION}/examples/sample_util.c
-share/doc/${PKGBASE}-${PKGVERSION}/examples/sample_util.h
-share/doc/${PKGBASE}-${PKGVERSION}/examples/upnp_tv_ctrlpt.c
-share/doc/${PKGBASE}-${PKGVERSION}/examples/upnp_tv_ctrlpt.h
-share/doc/${PKGBASE}-${PKGVERSION}/examples/upnp_tv_ctrlpt_main.c
-share/doc/${PKGBASE}-${PKGVERSION}/examples/upnp_tv_device.c
-share/doc/${PKGBASE}-${PKGVERSION}/examples/upnp_tv_device.h
-share/doc/${PKGBASE}-${PKGVERSION}/examples/upnp_tv_device_main.c
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/icon1.gif
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/icon2.gif
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/toc.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/General.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/index.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/Introduction.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/License.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/AboutCallbacks.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/TheAPI.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/Errorcodes.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_SUCCESS0.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_INVALID_HANDLE-100.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_INVALID_PARAM-101.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_OUTOF_HANDLE-102.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_OUTOF_MEMORY-104.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_INIT-105.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_INVALID_DESC-107.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_INVALID_URL-108.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_INVALID_SERVICE-111.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_BAD_RESPONSE-113.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_INVALID_ACTION-115.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_FINISH-116.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_INIT_FAILED-117.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_BAD_HTTPMSG-119.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_ALREADY_REGISTERED-120.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_NETWORK_ERROR-200.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_SOCKET_WRITE-201.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_SOCKET_READ-202.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_SOCKET_BIND-203.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_SOCKET_CONNECT-204.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_OUTOF_SOCKET-205.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_LISTEN-206.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_TIMEDOUT-207.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_SOCKET_ERROR-208.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_CANCELED-210.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_SUBSCRIBE_UNACCEPTED-301.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_UNSUBSCRIBE_UNACCEPTED-302.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_NOTIFY_UNACCEPTED-303.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_INVALID_ARGUMENT-501.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_FILE_NOT_FOUND-502.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_FILE_READ_ERROR-503.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_EXT_NOT_XML-504.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_NOT_FOUND-507.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_E_INTERNAL_ERROR-911.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/ConstantsStructuresandTypes.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UpnpClient_Handle.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UpnpDevice_Handle.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPnP_EventType.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_CONTROL_ACTION_REQUEST.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_CONTROL_ACTION_COMPLETE.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_CONTROL_GET_VAR_REQUEST.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_CONTROL_GET_VAR_COMPLETE.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_DISCOVERY_ADVERTISEMENT_ALIVE.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_DISCOVERY_ADVERTISEMENT_BYEBYE.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_DISCOVERY_SEARCH_RESULT.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_DISCOVERY_SEARCH_TIMEOUT.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_EVENT_SUBSCRIPTION_REQUEST.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_EVENT_RECEIVED.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_EVENT_RENEWAL_COMPLETE.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_EVENT_SUBSCRIBE_COMPLETE.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_EVENT_UNSUBSCRIBE_COMPLETE.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_EVENT_AUTORENEWAL_FAILED.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_EVENT_SUBSCRIPTION_EXPIRED.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/Upnp_SID44.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/Upnp_SType.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_S_ALL.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_S_ROOT.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_S_DEVICE.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNP_S_SERVICE.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/Upnp_DescType.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNPREG_URL_DESC.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNPREG_FILENAME_DESC.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UPNPREG_BUF_DESC.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/Upnp_Action_Request.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/Upnp_State_Var_Request.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/Upnp_State_Var_Complete.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/Upnp_Event.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/Upnp_Discovery.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/Upnp_Event_Subscribe.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/Upnp_Subscription_Request.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UpnpVirtualDirCallbacks.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/Upnp_FunPtr.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/InitializationandRegistration.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UpnpInit.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UpnpFinish.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UpnpGetServerPort.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UpnpGetServerIpAddress.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UpnpRegisterClient.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UpnpRegisterRootDevice.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UpnpRegisterRootDevice2.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UpnpUnRegisterClient.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UpnpUnRegisterRootDevice.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UpnpSetContentLength.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UpnpSetMaxContentLength.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/Discovery.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UpnpSearchAsync.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UpnpSendAdvertisement.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/Control.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UpnpGetServiceVarStatus.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UpnpGetServiceVarStatusAsync.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UpnpSendAction.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UpnpSendActionEx.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UpnpSendActionAsync.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UpnpSendActionExAsync.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/Eventing.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UpnpAcceptSubscription.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UpnpAcceptSubscriptionExt.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UpnpNotify.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UpnpNotifyExt.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UpnpRenewSubscription.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UpnpRenewSubscriptionAsync.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UpnpSetMaxSubscriptions.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UpnpSetMaxSubscriptionTimeOut.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UpnpSubscribe.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UpnpSubscribeAsync.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UpnpUnSubscribe.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UpnpUnSubscribeAsync.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/ControlPointHTTPAPI.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UpnpDownloadUrlItem.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UpnpOpenHttpGet.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UpnpOpenHttpGetProxy.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UpnpOpenHttpGetEx.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UpnpReadHttpGet.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UpnpHttpGetProgress.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UpnpCancelHttpGet.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UpnpCloseHttpGet.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UpnpOpenHttpPost.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UpnpWriteHttpPost.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UpnpCloseHttpPost.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UpnpDownloadXmlDoc.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/WebServerAPI.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UpnpSetWebServerRootDir.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UpnpSetVirtualDirCallbacks.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UpnpEnableWebserver.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UpnpIsWebserverEnabled.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UpnpAddVirtualDir.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UpnpRemoveVirtualDir.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UpnpRemoveAllVirtualDirs.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/OptionalToolAPIs.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UpnpResolveURL.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UpnpMakeAction.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UpnpAddToAction.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UpnpMakeActionResponse.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UpnpAddToActionResponse.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UpnpAddToPropertySet.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UpnpCreatePropertySet.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/upnp/UpnpGetErrorMessage.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/icon1.gif
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/icon2.gif
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/toc.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/General.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/index.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/Introduction.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/License.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/DOMInterfaces.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/InterfaceitNode.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlNode_getNodeName.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlNode_getNodeValue.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlNode_setNodeValue.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlNode_getNodeType.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlNode_getParentNode.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlNode_getChildNodes.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlNode_getFirstChild.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlNode_getLastChild.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlNode_getPreviousSibling.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlNode_getNextSibling.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlNode_getAttributes.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlNode_getOwnerDocument.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlNode_getNamespaceURI.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlNode_getPrefix.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlNode_getLocalName.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlNode_insertBefore.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlNode_replaceChild.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlNode_removeChild.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlNode_appendChild.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlNode_hasChildNodes.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlNode_cloneNode.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlNode_hasAttributes.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlNode_free.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/InterfaceitAttr.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlAttr_free.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/InterfaceitCDATASection.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlCDATASection_init.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlCDATASection_free.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/InterfaceitDocument.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlDocument_init.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlDocument_createDocumentEx.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlDocument_createDocument.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlDocument_createElementEx.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlDocument_createElement.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlDocument_createTextNodeEx.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlDocument_createTextNode.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlDocument_createCDATASectionEx.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlDocument_createCDATASection.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlDocument_createAttribute.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlDocument_createAttributeEx.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlDocument_getElementsByTagName.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlDocument_createElementNSEx.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlDocument_createElementNS.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlDocument_createAttributeNSEx.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlDocument_createAttributeNS.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlDocument_getElementsByTagNameNS.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlDocument_getElementById.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlDocument_free.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlDocument_importNode.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/InterfaceitElement.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlElement_init.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlElement_getTagName.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlElement_getAttribute.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlElement_setAttribute.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlElement_removeAttribute.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlElement_getAttributeNode.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlElement_setAttributeNode.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlElement_removeAttributeNode.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlElement_getElementsByTagName.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlElement_getAttributeNS.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlElement_setAttributeNS.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlElement_removeAttributeNS.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlElement_getAttributeNodeNS.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlElement_setAttributeNodeNS.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlElement_getElementsByTagNameNS.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlElement_hasAttribute.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlElement_hasAttributeNS.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlElement_free.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/InterfaceitNamedNodeMap.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlNamedNodeMap_getLength.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlNamedNodeMap_getNamedItem.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlNamedNodeMap_setNamedItem.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlNamedNodeMap_removeNamedItem.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlNamedNodeMap_item.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlNamedNodeMap_getNamedItemNS.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlNamedNodeMap_setNamedItemNS.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlNamedNodeMap_removeNamedItemNS.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlNamedNodeMap_free.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/InterfaceitNodeList.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlNodeList_item.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlNodeList_length.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlNodeList_free.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/IXMLAPI.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlPrintDocument.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlPrintNode.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlDocumenttoString.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlNodetoString.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlRelaxParser.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlParseBuffer.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlParseBufferEx.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlLoadDocument.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlLoadDocumentEx.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlCloneDOMString.html
-share/doc/${PKGBASE}-${PKGVERSION}/html/ixml/ixmlFreeDOMString.html
+share/doc/${PKGNAME}/IXML_Programming_Guide.pdf
+share/doc/${PKGNAME}/UPnP_Programming_Guide.pdf
+share/doc/${PKGNAME}/html/ixml/DOMInterfaces.html
+share/doc/${PKGNAME}/html/ixml/General.html
+share/doc/${PKGNAME}/html/ixml/IXMLAPI.html
+share/doc/${PKGNAME}/html/ixml/InterfaceitAttr.html
+share/doc/${PKGNAME}/html/ixml/InterfaceitCDATASection.html
+share/doc/${PKGNAME}/html/ixml/InterfaceitDocument.html
+share/doc/${PKGNAME}/html/ixml/InterfaceitElement.html
+share/doc/${PKGNAME}/html/ixml/InterfaceitNamedNodeMap.html
+share/doc/${PKGNAME}/html/ixml/InterfaceitNode.html
+share/doc/${PKGNAME}/html/ixml/InterfaceitNodeList.html
+share/doc/${PKGNAME}/html/ixml/Introduction.html
+share/doc/${PKGNAME}/html/ixml/License.html
+share/doc/${PKGNAME}/html/ixml/icon1.gif
+share/doc/${PKGNAME}/html/ixml/icon2.gif
+share/doc/${PKGNAME}/html/ixml/index.html
+share/doc/${PKGNAME}/html/ixml/ixmlAttr_free.html
+share/doc/${PKGNAME}/html/ixml/ixmlCDATASection_free.html
+share/doc/${PKGNAME}/html/ixml/ixmlCDATASection_init.html
+share/doc/${PKGNAME}/html/ixml/ixmlCloneDOMString.html
+share/doc/${PKGNAME}/html/ixml/ixmlDocument_createAttribute.html
+share/doc/${PKGNAME}/html/ixml/ixmlDocument_createAttributeEx.html
+share/doc/${PKGNAME}/html/ixml/ixmlDocument_createAttributeNS.html
+share/doc/${PKGNAME}/html/ixml/ixmlDocument_createAttributeNSEx.html
+share/doc/${PKGNAME}/html/ixml/ixmlDocument_createCDATASection.html
+share/doc/${PKGNAME}/html/ixml/ixmlDocument_createCDATASectionEx.html
+share/doc/${PKGNAME}/html/ixml/ixmlDocument_createDocument.html
+share/doc/${PKGNAME}/html/ixml/ixmlDocument_createDocumentEx.html
+share/doc/${PKGNAME}/html/ixml/ixmlDocument_createElement.html
+share/doc/${PKGNAME}/html/ixml/ixmlDocument_createElementEx.html
+share/doc/${PKGNAME}/html/ixml/ixmlDocument_createElementNS.html
+share/doc/${PKGNAME}/html/ixml/ixmlDocument_createElementNSEx.html
+share/doc/${PKGNAME}/html/ixml/ixmlDocument_createTextNode.html
+share/doc/${PKGNAME}/html/ixml/ixmlDocument_createTextNodeEx.html
+share/doc/${PKGNAME}/html/ixml/ixmlDocument_free.html
+share/doc/${PKGNAME}/html/ixml/ixmlDocument_getElementById.html
+share/doc/${PKGNAME}/html/ixml/ixmlDocument_getElementsByTagName.html
+share/doc/${PKGNAME}/html/ixml/ixmlDocument_getElementsByTagNameNS.html
+share/doc/${PKGNAME}/html/ixml/ixmlDocument_importNode.html
+share/doc/${PKGNAME}/html/ixml/ixmlDocument_init.html
+share/doc/${PKGNAME}/html/ixml/ixmlDocumenttoString.html
+share/doc/${PKGNAME}/html/ixml/ixmlElement_free.html
+share/doc/${PKGNAME}/html/ixml/ixmlElement_getAttribute.html
+share/doc/${PKGNAME}/html/ixml/ixmlElement_getAttributeNS.html
+share/doc/${PKGNAME}/html/ixml/ixmlElement_getAttributeNode.html
+share/doc/${PKGNAME}/html/ixml/ixmlElement_getAttributeNodeNS.html
+share/doc/${PKGNAME}/html/ixml/ixmlElement_getElementsByTagName.html
+share/doc/${PKGNAME}/html/ixml/ixmlElement_getElementsByTagNameNS.html
+share/doc/${PKGNAME}/html/ixml/ixmlElement_getTagName.html
+share/doc/${PKGNAME}/html/ixml/ixmlElement_hasAttribute.html
+share/doc/${PKGNAME}/html/ixml/ixmlElement_hasAttributeNS.html
+share/doc/${PKGNAME}/html/ixml/ixmlElement_init.html
+share/doc/${PKGNAME}/html/ixml/ixmlElement_removeAttribute.html
+share/doc/${PKGNAME}/html/ixml/ixmlElement_removeAttributeNS.html
+share/doc/${PKGNAME}/html/ixml/ixmlElement_removeAttributeNode.html
+share/doc/${PKGNAME}/html/ixml/ixmlElement_setAttribute.html
+share/doc/${PKGNAME}/html/ixml/ixmlElement_setAttributeNS.html
+share/doc/${PKGNAME}/html/ixml/ixmlElement_setAttributeNode.html
+share/doc/${PKGNAME}/html/ixml/ixmlElement_setAttributeNodeNS.html
+share/doc/${PKGNAME}/html/ixml/ixmlFreeDOMString.html
+share/doc/${PKGNAME}/html/ixml/ixmlLoadDocument.html
+share/doc/${PKGNAME}/html/ixml/ixmlLoadDocumentEx.html
+share/doc/${PKGNAME}/html/ixml/ixmlNamedNodeMap_free.html
+share/doc/${PKGNAME}/html/ixml/ixmlNamedNodeMap_getLength.html
+share/doc/${PKGNAME}/html/ixml/ixmlNamedNodeMap_getNamedItem.html
+share/doc/${PKGNAME}/html/ixml/ixmlNamedNodeMap_getNamedItemNS.html
+share/doc/${PKGNAME}/html/ixml/ixmlNamedNodeMap_item.html
+share/doc/${PKGNAME}/html/ixml/ixmlNamedNodeMap_removeNamedItem.html
+share/doc/${PKGNAME}/html/ixml/ixmlNamedNodeMap_removeNamedItemNS.html
+share/doc/${PKGNAME}/html/ixml/ixmlNamedNodeMap_setNamedItem.html
+share/doc/${PKGNAME}/html/ixml/ixmlNamedNodeMap_setNamedItemNS.html
+share/doc/${PKGNAME}/html/ixml/ixmlNodeList_free.html
+share/doc/${PKGNAME}/html/ixml/ixmlNodeList_item.html
+share/doc/${PKGNAME}/html/ixml/ixmlNodeList_length.html
+share/doc/${PKGNAME}/html/ixml/ixmlNode_appendChild.html
+share/doc/${PKGNAME}/html/ixml/ixmlNode_cloneNode.html
+share/doc/${PKGNAME}/html/ixml/ixmlNode_free.html
+share/doc/${PKGNAME}/html/ixml/ixmlNode_getAttributes.html
+share/doc/${PKGNAME}/html/ixml/ixmlNode_getChildNodes.html
+share/doc/${PKGNAME}/html/ixml/ixmlNode_getFirstChild.html
+share/doc/${PKGNAME}/html/ixml/ixmlNode_getLastChild.html
+share/doc/${PKGNAME}/html/ixml/ixmlNode_getLocalName.html
+share/doc/${PKGNAME}/html/ixml/ixmlNode_getNamespaceURI.html
+share/doc/${PKGNAME}/html/ixml/ixmlNode_getNextSibling.html
+share/doc/${PKGNAME}/html/ixml/ixmlNode_getNodeName.html
+share/doc/${PKGNAME}/html/ixml/ixmlNode_getNodeType.html
+share/doc/${PKGNAME}/html/ixml/ixmlNode_getNodeValue.html
+share/doc/${PKGNAME}/html/ixml/ixmlNode_getOwnerDocument.html
+share/doc/${PKGNAME}/html/ixml/ixmlNode_getParentNode.html
+share/doc/${PKGNAME}/html/ixml/ixmlNode_getPrefix.html
+share/doc/${PKGNAME}/html/ixml/ixmlNode_getPreviousSibling.html
+share/doc/${PKGNAME}/html/ixml/ixmlNode_hasAttributes.html
+share/doc/${PKGNAME}/html/ixml/ixmlNode_hasChildNodes.html
+share/doc/${PKGNAME}/html/ixml/ixmlNode_insertBefore.html
+share/doc/${PKGNAME}/html/ixml/ixmlNode_removeChild.html
+share/doc/${PKGNAME}/html/ixml/ixmlNode_replaceChild.html
+share/doc/${PKGNAME}/html/ixml/ixmlNode_setNodeValue.html
+share/doc/${PKGNAME}/html/ixml/ixmlNodetoString.html
+share/doc/${PKGNAME}/html/ixml/ixmlParseBuffer.html
+share/doc/${PKGNAME}/html/ixml/ixmlParseBufferEx.html
+share/doc/${PKGNAME}/html/ixml/ixmlPrintDocument.html
+share/doc/${PKGNAME}/html/ixml/ixmlPrintNode.html
+share/doc/${PKGNAME}/html/ixml/ixmlRelaxParser.html
+share/doc/${PKGNAME}/html/ixml/toc.html
+share/doc/${PKGNAME}/html/upnp/AboutCallbacks.html
+share/doc/${PKGNAME}/html/upnp/ConstantsStructuresandTypes.html
+share/doc/${PKGNAME}/html/upnp/Control.html
+share/doc/${PKGNAME}/html/upnp/ControlPointHTTPAPI.html
+share/doc/${PKGNAME}/html/upnp/Discovery.html
+share/doc/${PKGNAME}/html/upnp/Errorcodes.html
+share/doc/${PKGNAME}/html/upnp/Eventing.html
+share/doc/${PKGNAME}/html/upnp/General.html
+share/doc/${PKGNAME}/html/upnp/InitializationandRegistration.html
+share/doc/${PKGNAME}/html/upnp/Introduction.html
+share/doc/${PKGNAME}/html/upnp/License.html
+share/doc/${PKGNAME}/html/upnp/OptionalToolAPIs.html
+share/doc/${PKGNAME}/html/upnp/TheAPI.html
+share/doc/${PKGNAME}/html/upnp/UPNPREG_BUF_DESC.html
+share/doc/${PKGNAME}/html/upnp/UPNPREG_FILENAME_DESC.html
+share/doc/${PKGNAME}/html/upnp/UPNPREG_URL_DESC.html
+share/doc/${PKGNAME}/html/upnp/UPNP_CONTROL_ACTION_COMPLETE.html
+share/doc/${PKGNAME}/html/upnp/UPNP_CONTROL_ACTION_REQUEST.html
+share/doc/${PKGNAME}/html/upnp/UPNP_CONTROL_GET_VAR_COMPLETE.html
+share/doc/${PKGNAME}/html/upnp/UPNP_CONTROL_GET_VAR_REQUEST.html
+share/doc/${PKGNAME}/html/upnp/UPNP_DISCOVERY_ADVERTISEMENT_ALIVE.html
+share/doc/${PKGNAME}/html/upnp/UPNP_DISCOVERY_ADVERTISEMENT_BYEBYE.html
+share/doc/${PKGNAME}/html/upnp/UPNP_DISCOVERY_SEARCH_RESULT.html
+share/doc/${PKGNAME}/html/upnp/UPNP_DISCOVERY_SEARCH_TIMEOUT.html
+share/doc/${PKGNAME}/html/upnp/UPNP_EVENT_AUTORENEWAL_FAILED.html
+share/doc/${PKGNAME}/html/upnp/UPNP_EVENT_RECEIVED.html
+share/doc/${PKGNAME}/html/upnp/UPNP_EVENT_RENEWAL_COMPLETE.html
+share/doc/${PKGNAME}/html/upnp/UPNP_EVENT_SUBSCRIBE_COMPLETE.html
+share/doc/${PKGNAME}/html/upnp/UPNP_EVENT_SUBSCRIPTION_EXPIRED.html
+share/doc/${PKGNAME}/html/upnp/UPNP_EVENT_SUBSCRIPTION_REQUEST.html
+share/doc/${PKGNAME}/html/upnp/UPNP_EVENT_UNSUBSCRIBE_COMPLETE.html
+share/doc/${PKGNAME}/html/upnp/UPNP_E_ALREADY_REGISTERED-120.html
+share/doc/${PKGNAME}/html/upnp/UPNP_E_BAD_HTTPMSG-119.html
+share/doc/${PKGNAME}/html/upnp/UPNP_E_BAD_RESPONSE-113.html
+share/doc/${PKGNAME}/html/upnp/UPNP_E_CANCELED-210.html
+share/doc/${PKGNAME}/html/upnp/UPNP_E_EXT_NOT_XML-504.html
+share/doc/${PKGNAME}/html/upnp/UPNP_E_FILE_NOT_FOUND-502.html
+share/doc/${PKGNAME}/html/upnp/UPNP_E_FILE_READ_ERROR-503.html
+share/doc/${PKGNAME}/html/upnp/UPNP_E_FINISH-116.html
+share/doc/${PKGNAME}/html/upnp/UPNP_E_INIT-105.html
+share/doc/${PKGNAME}/html/upnp/UPNP_E_INIT_FAILED-117.html
+share/doc/${PKGNAME}/html/upnp/UPNP_E_INTERNAL_ERROR-911.html
+share/doc/${PKGNAME}/html/upnp/UPNP_E_INVALID_ACTION-115.html
+share/doc/${PKGNAME}/html/upnp/UPNP_E_INVALID_ARGUMENT-501.html
+share/doc/${PKGNAME}/html/upnp/UPNP_E_INVALID_DESC-107.html
+share/doc/${PKGNAME}/html/upnp/UPNP_E_INVALID_HANDLE-100.html
+share/doc/${PKGNAME}/html/upnp/UPNP_E_INVALID_PARAM-101.html
+share/doc/${PKGNAME}/html/upnp/UPNP_E_INVALID_SERVICE-111.html
+share/doc/${PKGNAME}/html/upnp/UPNP_E_INVALID_URL-108.html
+share/doc/${PKGNAME}/html/upnp/UPNP_E_LISTEN-206.html
+share/doc/${PKGNAME}/html/upnp/UPNP_E_NETWORK_ERROR-200.html
+share/doc/${PKGNAME}/html/upnp/UPNP_E_NOTIFY_UNACCEPTED-303.html
+share/doc/${PKGNAME}/html/upnp/UPNP_E_NOT_FOUND-507.html
+share/doc/${PKGNAME}/html/upnp/UPNP_E_OUTOF_HANDLE-102.html
+share/doc/${PKGNAME}/html/upnp/UPNP_E_OUTOF_MEMORY-104.html
+share/doc/${PKGNAME}/html/upnp/UPNP_E_OUTOF_SOCKET-205.html
+share/doc/${PKGNAME}/html/upnp/UPNP_E_SOCKET_BIND-203.html
+share/doc/${PKGNAME}/html/upnp/UPNP_E_SOCKET_CONNECT-204.html
+share/doc/${PKGNAME}/html/upnp/UPNP_E_SOCKET_ERROR-208.html
+share/doc/${PKGNAME}/html/upnp/UPNP_E_SOCKET_READ-202.html
+share/doc/${PKGNAME}/html/upnp/UPNP_E_SOCKET_WRITE-201.html
+share/doc/${PKGNAME}/html/upnp/UPNP_E_SUBSCRIBE_UNACCEPTED-301.html
+share/doc/${PKGNAME}/html/upnp/UPNP_E_SUCCESS0.html
+share/doc/${PKGNAME}/html/upnp/UPNP_E_TIMEDOUT-207.html
+share/doc/${PKGNAME}/html/upnp/UPNP_E_UNSUBSCRIBE_UNACCEPTED-302.html
+share/doc/${PKGNAME}/html/upnp/UPNP_S_ALL.html
+share/doc/${PKGNAME}/html/upnp/UPNP_S_DEVICE.html
+share/doc/${PKGNAME}/html/upnp/UPNP_S_ROOT.html
+share/doc/${PKGNAME}/html/upnp/UPNP_S_SERVICE.html
+share/doc/${PKGNAME}/html/upnp/UPnP_EventType.html
+share/doc/${PKGNAME}/html/upnp/UpnpAcceptSubscription.html
+share/doc/${PKGNAME}/html/upnp/UpnpAcceptSubscriptionExt.html
+share/doc/${PKGNAME}/html/upnp/UpnpAddToAction.html
+share/doc/${PKGNAME}/html/upnp/UpnpAddToActionResponse.html
+share/doc/${PKGNAME}/html/upnp/UpnpAddToPropertySet.html
+share/doc/${PKGNAME}/html/upnp/UpnpAddVirtualDir.html
+share/doc/${PKGNAME}/html/upnp/UpnpCancelHttpGet.html
+share/doc/${PKGNAME}/html/upnp/UpnpClient_Handle.html
+share/doc/${PKGNAME}/html/upnp/UpnpCloseHttpGet.html
+share/doc/${PKGNAME}/html/upnp/UpnpCloseHttpPost.html
+share/doc/${PKGNAME}/html/upnp/UpnpCreatePropertySet.html
+share/doc/${PKGNAME}/html/upnp/UpnpDevice_Handle.html
+share/doc/${PKGNAME}/html/upnp/UpnpDownloadUrlItem.html
+share/doc/${PKGNAME}/html/upnp/UpnpDownloadXmlDoc.html
+share/doc/${PKGNAME}/html/upnp/UpnpEnableWebserver.html
+share/doc/${PKGNAME}/html/upnp/UpnpFinish.html
+share/doc/${PKGNAME}/html/upnp/UpnpGetErrorMessage.html
+share/doc/${PKGNAME}/html/upnp/UpnpGetServerIpAddress.html
+share/doc/${PKGNAME}/html/upnp/UpnpGetServerPort.html
+share/doc/${PKGNAME}/html/upnp/UpnpGetServiceVarStatus.html
+share/doc/${PKGNAME}/html/upnp/UpnpGetServiceVarStatusAsync.html
+share/doc/${PKGNAME}/html/upnp/UpnpHttpGetProgress.html
+share/doc/${PKGNAME}/html/upnp/UpnpInit.html
+share/doc/${PKGNAME}/html/upnp/UpnpIsWebserverEnabled.html
+share/doc/${PKGNAME}/html/upnp/UpnpMakeAction.html
+share/doc/${PKGNAME}/html/upnp/UpnpMakeActionResponse.html
+share/doc/${PKGNAME}/html/upnp/UpnpNotify.html
+share/doc/${PKGNAME}/html/upnp/UpnpNotifyExt.html
+share/doc/${PKGNAME}/html/upnp/UpnpOpenHttpGet.html
+share/doc/${PKGNAME}/html/upnp/UpnpOpenHttpGetEx.html
+share/doc/${PKGNAME}/html/upnp/UpnpOpenHttpGetProxy.html
+share/doc/${PKGNAME}/html/upnp/UpnpOpenHttpPost.html
+share/doc/${PKGNAME}/html/upnp/UpnpReadHttpGet.html
+share/doc/${PKGNAME}/html/upnp/UpnpRegisterClient.html
+share/doc/${PKGNAME}/html/upnp/UpnpRegisterRootDevice.html
+share/doc/${PKGNAME}/html/upnp/UpnpRegisterRootDevice2.html
+share/doc/${PKGNAME}/html/upnp/UpnpRemoveAllVirtualDirs.html
+share/doc/${PKGNAME}/html/upnp/UpnpRemoveVirtualDir.html
+share/doc/${PKGNAME}/html/upnp/UpnpRenewSubscription.html
+share/doc/${PKGNAME}/html/upnp/UpnpRenewSubscriptionAsync.html
+share/doc/${PKGNAME}/html/upnp/UpnpResolveURL.html
+share/doc/${PKGNAME}/html/upnp/UpnpSearchAsync.html
+share/doc/${PKGNAME}/html/upnp/UpnpSendAction.html
+share/doc/${PKGNAME}/html/upnp/UpnpSendActionAsync.html
+share/doc/${PKGNAME}/html/upnp/UpnpSendActionEx.html
+share/doc/${PKGNAME}/html/upnp/UpnpSendActionExAsync.html
+share/doc/${PKGNAME}/html/upnp/UpnpSendAdvertisement.html
+share/doc/${PKGNAME}/html/upnp/UpnpSetContentLength.html
+share/doc/${PKGNAME}/html/upnp/UpnpSetMaxContentLength.html
+share/doc/${PKGNAME}/html/upnp/UpnpSetMaxSubscriptionTimeOut.html
+share/doc/${PKGNAME}/html/upnp/UpnpSetMaxSubscriptions.html
+share/doc/${PKGNAME}/html/upnp/UpnpSetVirtualDirCallbacks.html
+share/doc/${PKGNAME}/html/upnp/UpnpSetWebServerRootDir.html
+share/doc/${PKGNAME}/html/upnp/UpnpSubscribe.html
+share/doc/${PKGNAME}/html/upnp/UpnpSubscribeAsync.html
+share/doc/${PKGNAME}/html/upnp/UpnpUnRegisterClient.html
+share/doc/${PKGNAME}/html/upnp/UpnpUnRegisterRootDevice.html
+share/doc/${PKGNAME}/html/upnp/UpnpUnSubscribe.html
+share/doc/${PKGNAME}/html/upnp/UpnpUnSubscribeAsync.html
+share/doc/${PKGNAME}/html/upnp/UpnpVirtualDirCallbacks.html
+share/doc/${PKGNAME}/html/upnp/UpnpWriteHttpPost.html
+share/doc/${PKGNAME}/html/upnp/Upnp_Action_Request.html
+share/doc/${PKGNAME}/html/upnp/Upnp_DescType.html
+share/doc/${PKGNAME}/html/upnp/Upnp_Discovery.html
+share/doc/${PKGNAME}/html/upnp/Upnp_Event.html
+share/doc/${PKGNAME}/html/upnp/Upnp_Event_Subscribe.html
+share/doc/${PKGNAME}/html/upnp/Upnp_FunPtr.html
+share/doc/${PKGNAME}/html/upnp/Upnp_SID44.html
+share/doc/${PKGNAME}/html/upnp/Upnp_SType.html
+share/doc/${PKGNAME}/html/upnp/Upnp_State_Var_Complete.html
+share/doc/${PKGNAME}/html/upnp/Upnp_State_Var_Request.html
+share/doc/${PKGNAME}/html/upnp/Upnp_Subscription_Request.html
+share/doc/${PKGNAME}/html/upnp/WebServerAPI.html
+share/doc/${PKGNAME}/html/upnp/icon1.gif
+share/doc/${PKGNAME}/html/upnp/icon2.gif
+share/doc/${PKGNAME}/html/upnp/index.html
+share/doc/${PKGNAME}/html/upnp/toc.html
+@pkgdir share/doc/${PKGNAME}/examples
diff --git a/net/libupnp/buildlink3.mk b/net/libupnp/buildlink3.mk
index d4a2b88a768..81fa11b6e3b 100644
--- a/net/libupnp/buildlink3.mk
+++ b/net/libupnp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:10 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2012/04/13 23:38:34 obache Exp $
 
 BUILDLINK_TREE+=	libupnp
 
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=	libupnp
 LIBUPNP_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libupnp+=	libupnp>=1.4.6
+BUILDLINK_ABI_DEPENDS.libupnp+=	libupnp>=1.6.14
 BUILDLINK_PKGSRCDIR.libupnp?=	../../net/libupnp
 .endif # LIBUPNP_BUILDLINK3_MK
 
diff --git a/net/libupnp/distinfo b/net/libupnp/distinfo
index 014061a1b76..6db8d8880a0 100644
--- a/net/libupnp/distinfo
+++ b/net/libupnp/distinfo
@@ -1,12 +1,5 @@
-$NetBSD: distinfo,v 1.16 2011/08/20 15:36:16 joerg Exp $
+$NetBSD: distinfo,v 1.17 2012/04/13 23:38:34 obache Exp $
 
-SHA1 (libupnp-1.6.6.tar.bz2) = 24c2c349cb52ed3d62121fbdae205c8d9dc0f5fa
-RMD160 (libupnp-1.6.6.tar.bz2) = 25ff0390793cfa48cca32a335b4d633283b1fe64
-Size (libupnp-1.6.6.tar.bz2) = 1146854 bytes
-SHA1 (patch-aa) = cfdbe2bfdac1aab7f6f74534429ceec70f1ceac3
-SHA1 (patch-ab) = cfdedfc192854389d77ee79d875b618a204770f9
-SHA1 (patch-ac) = 05ba4584d2ebdb2de041e67f4c8d1c05e4fc1970
-SHA1 (patch-ae) = 7331c61d5b3a47ca3865788cf88a973d5e9352a1
-SHA1 (patch-ag) = b6b555fd2e7d5ddf5f63b25d8b915cdd7d0d03ba
-SHA1 (patch-ah) = f46422955005a8b1b187163e97ee84a45b713847
-SHA1 (patch-upnp-src-genlib-net-http-webserver.c) = d52857b9ea7d26686feebd7bb513ef62845b2636
+SHA1 (libupnp-1.6.17.tar.bz2) = 179e0c1337915d45ea8c04c1fa86257c9dfc5924
+RMD160 (libupnp-1.6.17.tar.bz2) = 179599a8253f7df2e1085493e2d5925458195a19
+Size (libupnp-1.6.17.tar.bz2) = 1187499 bytes
diff --git a/net/libupnp/options.mk b/net/libupnp/options.mk
new file mode 100644
index 00000000000..215654901c7
--- /dev/null
+++ b/net/libupnp/options.mk
@@ -0,0 +1,19 @@
+# $NetBSD: options.mk,v 1.1 2012/04/13 23:38:34 obache Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.libupnp
+PKG_SUPPORTED_OPTIONS=	inet6 debug
+PKG_SUGGESTED_OPTIONS=	# empty
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Minet6)
+CONFIGURE_ARGS+=	--enable-ipv6
+.else
+CONFIGURE_ARGS+=	--disable-ipv6
+.endif
+
+.if !empty(PKG_OPTIONS:Mdebug)
+CONFIGURE_ARGS+=	--enable-debug
+.else
+CONFIGURE_ARGS+=	--disable-debug
+.endif
diff --git a/net/libupnp/patches/patch-aa b/net/libupnp/patches/patch-aa
deleted file mode 100644
index 665dd455862..00000000000
--- a/net/libupnp/patches/patch-aa
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD: patch-aa,v 1.10 2009/02/24 09:36:23 obache Exp $
-
---- threadutil/src/ThreadPool.c.orig	2008-04-10 16:03:04.000000000 +0000
-+++ threadutil/src/ThreadPool.c
-@@ -234,12 +234,20 @@ static int SetPolicyType( PolicyType in 
- 	return 0;
- #elif defined(WIN32)
- 	return sched_setscheduler( 0, in );
--#elif defined(_POSIX_PRIORITY_SCHEDULING) && _POSIX_PRIORITY_SCHEDULING > 0
-+#elif defined(_POSIX_PRIORITY_SCHEDULING) && _POSIX_PRIORITY_SCHEDULING >= 200112L
-+#if defined(__NetBSD__)
-+	if (in != SCHED_OTHER) {
-+#endif
- 	struct sched_param current;
- 
- 	sched_getparam( 0, &current );
--	current.sched_priority = DEFAULT_SCHED_PARAM;
--	return sched_setscheduler( 0, in, &current );
-+	current.sched_priority = sched_get_priority_min(in);
-+	return sched_setscheduler( 0, in, &current ) == -1 ? -1 : 0;
-+#if defined(__NetBSD__)
-+	} else {
-+	return 0;
-+	}
-+#endif
- #else
- 	return 0;
- #endif
-@@ -261,7 +269,7 @@ static int SetPolicyType( PolicyType in 
-  *****************************************************************************/
- static int SetPriority( ThreadPriority priority )
- {
--#if defined(_POSIX_PRIORITY_SCHEDULING) && _POSIX_PRIORITY_SCHEDULING > 0
-+#if defined(_POSIX_PRIORITY_SCHEDULING) && _POSIX_PRIORITY_SCHEDULING >= 200112L
- 	int currentPolicy;
- 	int minPriority = 0;
- 	int maxPriority = 0;
-@@ -389,7 +397,7 @@ static void SetSeed()
- 	gettimeofday(&t, NULL);
- #if defined(WIN32)
-  	srand( ( unsigned int )t.tv_usec + (unsigned int)ithread_get_current_thread_id().p );
--#elif defined(__FreeBSD__) || defined(__OSX__) || defined(__APPLE__)
-+#elif defined(__FreeBSD__) || defined(__OSX__) || defined(__APPLE__) || defined(__NetBSD__) || defined(__DragonFly__)
-  	srand( ( unsigned int )t.tv_usec + (unsigned int)ithread_get_current_thread_id() );
- #elif defined(__linux__) || defined(__sun)
-  	srand( ( unsigned int )t.tv_usec + ithread_get_current_thread_id() );
diff --git a/net/libupnp/patches/patch-ab b/net/libupnp/patches/patch-ab
deleted file mode 100644
index 9e289c44891..00000000000
--- a/net/libupnp/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2008/05/15 13:42:29 obache Exp $
-
---- upnp/src/ssdp/ssdp_server.c.orig	2008-03-20 23:08:25.000000000 +0000
-+++ upnp/src/ssdp/ssdp_server.c
-@@ -47,6 +47,8 @@
- 	#include <winsock2.h>
- 	#include <ws2tcpip.h>
- 	#include "unixutil.h"
-+#else
-+	#include <sys/param.h>
- #endif
- 
- #define MAX_TIME_TOREAD  45
-@@ -915,7 +917,7 @@ get_ssdp_sockets( MiniServerSockArray * 
-         return UPNP_E_SOCKET_ERROR;
-     }
-     
--#if defined(__FreeBSD__) || defined(__OSX__) || defined(__APPLE__)
-+#if (defined(BSD) && BSD >= 199306) || defined(__OSX__) || defined(__APPLE__)
-     ret = setsockopt( ssdpSock, SOL_SOCKET, SO_REUSEPORT,
-         (char *)&onOff, sizeof (onOff) );
-     if ( ret == -1 ) {
diff --git a/net/libupnp/patches/patch-ac b/net/libupnp/patches/patch-ac
deleted file mode 100644
index 56fff151392..00000000000
--- a/net/libupnp/patches/patch-ac
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2007/11/08 03:56:58 obache Exp $
-
---- upnp/src/genlib/net/uri/uri.c.orig	2007-08-06 01:21:23.000000000 +0000
-+++ upnp/src/genlib/net/uri/uri.c
-@@ -625,9 +625,9 @@ parse_hostport( const char *in,
-         //call gethostbyname_r (reentrant form of gethostbyname)
-         // TODO: Use autoconf to discover this rather than the
-         // platform-specific stuff below
--#if defined(WIN32) || defined(__CYGWIN__)
-+#if defined(WIN32) || defined(__CYGWIN__) || defined(_AIX50) || defined(__upux11)
-         h = gethostbyname(temp_host_name);
--#elif defined(SPARC_SOLARIS)
-+#elif defined(sun) || defined(__sun) || defined(sgi) || defined(__sgi)
-         errCode = gethostbyname_r(
-                 temp_host_name,
-                 &h,
-@@ -647,12 +647,17 @@ parse_hostport( const char *in,
-         if ( h == NULL ) {
-                 errCode = 1;
-         }
--#elif defined(__linux__)
-+#elif defined(__GLIBC__)
-         errCode = gethostbyname_r(
-                 temp_host_name,
-                 &h_buf,
-                 temp_hostbyname_buff,
-                 BUFFER_SIZE, &h, &errcode );
-+#elif defined(__osf1__) || defined(__hpux) || defined(_AIX)
-+        errCode = gethostbyname_r( temp_host_name,
-+                                   &h_buf,
-+                                   (struct hostent_data*)temp_hostbyname_buff);
-+        h = &h_buf;
- #else
-         {
-         struct addrinfo hints, *res, *res0;
diff --git a/net/libupnp/patches/patch-ae b/net/libupnp/patches/patch-ae
deleted file mode 100644
index c131dba1faa..00000000000
--- a/net/libupnp/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2007/08/19 01:36:22 obache Exp $
-
---- libupnp.pc.in.orig	2007-05-26 15:08:41.000000000 +0000
-+++ libupnp.pc.in
-@@ -6,6 +6,6 @@ includedir=@includedir@
- Name: libupnp
- Description: Linux SDK for UPnP Devices
- Version: @VERSION@
--Libs: @PTHREAD_LIBS@ -L${libdir} -lupnp -lthreadutil -lixml 
-+Libs: @PTHREAD_LIBS@ -L${libdir} -lupnp -lthreadutil -lixml @LIBS@
- Cflags: @PTHREAD_CFLAGS@ -I${includedir}/upnp
- 
diff --git a/net/libupnp/patches/patch-ag b/net/libupnp/patches/patch-ag
deleted file mode 100644
index 872a0f20a16..00000000000
--- a/net/libupnp/patches/patch-ag
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ag,v 1.4 2007/08/19 01:36:23 obache Exp $
-
---- docs/dist/Makefile.in.orig	2007-05-26 15:36:17.000000000 +0000
-+++ docs/dist/Makefile.in
-@@ -742,6 +742,7 @@ install-nobase_docsDATA: $(nobase_docs_D
- 	list='$(nobase_docs_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  $(am__vpath_adj) \
-+	  $(mkdir_p) `dirname "$(DESTDIR)$(docsdir)/$$f"`; \
- 	  echo " $(nobase_docsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docsdir)/$$f'"; \
- 	  $(nobase_docsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docsdir)/$$f"; \
- 	done
diff --git a/net/libupnp/patches/patch-ah b/net/libupnp/patches/patch-ah
deleted file mode 100644
index 500aa069e46..00000000000
--- a/net/libupnp/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.3 2007/11/08 03:56:58 obache Exp $
-
---- threadutil/inc/ithread.h.orig	2007-11-06 01:46:41.000000000 +0000
-+++ threadutil/inc/ithread.h
-@@ -45,7 +45,7 @@ extern "C" {
- 	#define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE
- #endif
- 
--#ifdef PTHREAD_MUTEX_RECURSIVE
-+#if defined(PTHREAD_MUTEX_RECURSIVE) || defined(__DragonFly__)
- 	/* This system has SuS2-compliant mutex attributes.
- 	 * E.g. on Cygwin, where we don't have the old nonportable (NP) symbols
- 	 */
diff --git a/net/libupnp/patches/patch-upnp-src-genlib-net-http-webserver.c b/net/libupnp/patches/patch-upnp-src-genlib-net-http-webserver.c
deleted file mode 100644
index b0e8b5352b7..00000000000
--- a/net/libupnp/patches/patch-upnp-src-genlib-net-http-webserver.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-upnp-src-genlib-net-http-webserver.c,v 1.1 2011/08/20 15:36:16 joerg Exp $
-
---- upnp/src/genlib/net/http/webserver.c.orig	2011-08-19 14:13:11.000000000 +0000
-+++ upnp/src/genlib/net/http/webserver.c
-@@ -289,7 +289,7 @@ search_extension( IN const char *extensi
-  *	 0 - On Sucess
-  *	 UPNP_E_OUTOF_MEMORY - on memory allocation failures
-  ************************************************************************/
--UPNP_INLINE int
-+static UPNP_INLINE int
- get_content_type( IN const char *filename,
-                   OUT DOMString * content_type )
- {