Update libupnp to 1.6.0. Merge from wip/libupnp.

No functionally changes since RC1.

9 files changed, 366 insertions, 290 deletions

diff --git a/net/libupnp/Makefile b/net/libupnp/Makefile
index 1bf30424e03..f7ca4d59750 100644
--- a/net/libupnp/Makefile
+++ b/net/libupnp/Makefile
@@ -1,36 +1,23 @@
-# $NetBSD: Makefile,v 1.5 2007/06/19 01:40:13 rh Exp $
+# $NetBSD: Makefile,v 1.6 2007/08/19 01:36:22 obache Exp $
 #
 
-DISTNAME=		libupnp-1.6.0-rc1
-PKGNAME=		${DISTNAME:S/-rc1/rc1/}
+DISTNAME=		libupnp-1.6.0
 CATEGORIES=		net
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=pupnp/}
 EXTRACT_SUFX=		.tar.bz2
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
+MAINTAINER=		obache@NetBSD.org
 HOMEPAGE=		http://pupnp.sourceforge.net/
 COMMENT=		Portable Universal Plug and Play (UPnP) SDK
 
-WRKSRC=			${WRKDIR}/${DISTNAME:S/-rc1//}
-USE_LANGUAGES=		c c++
+USE_LANGUAGES=		c
 USE_TOOLS+=		pkg-config
-USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 
-PKGCONFIG_OVERRIDE+=	libupnp.pc.in
+CONFIGURE_ARGS+=	--with-documentation
 
-post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/${PKGNAME_NOREV}
-.for doc in IXML_Programming_Guide UPnP_Programming_Guide
-	${INSTALL_DATA} ${WRKSRC}/docs/dist/${doc}.pdf			\
-			${PREFIX}/share/doc/${PKGNAME_NOREV}
-.endfor
-.for dir in ixml upnp
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/${PKGNAME_NOREV}/html/${dir}
-	${INSTALL_DATA} ${WRKSRC}/docs/dist/${doc}/html/${dir}/*	\
-			${PREFIX}/share/doc/${PKGNAME_NOREV}/html/${dir}
-.endfor
+PKGCONFIG_OVERRIDE+=	libupnp.pc.in
 
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/libupnp/PLIST b/net/libupnp/PLIST
index fe9ed8ce89c..28c5d4ab077 100644
--- a/net/libupnp/PLIST
+++ b/net/libupnp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2007/06/19 01:40:13 rh Exp $
+@comment $NetBSD: PLIST,v 1.4 2007/08/19 01:36:22 obache Exp $
 include/upnp/FreeList.h
 include/upnp/LinkedList.h
 include/upnp/ThreadPool.h
@@ -14,260 +14,269 @@ lib/libixml.la
 lib/libthreadutil.la
 lib/libupnp.la
 lib/pkgconfig/libupnp.pc
-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_UNACCAPTED-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
-@dirrm share/doc/${PKGNAME}/html/upnp
-@dirrm share/doc/${PKGNAME}/html/ixml
-@dirrm share/doc/${PKGNAME}/html
-@dirrm share/doc/${PKGNAME}
+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_UNACCAPTED-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
+@dirrm share/doc/${PKGBASE}-${PKGVERSION}/html/ixml
+@dirrm share/doc/${PKGBASE}-${PKGVERSION}/html/upnp
+@dirrm share/doc/${PKGBASE}-${PKGVERSION}/html
+@dirrm share/doc/${PKGBASE}-${PKGVERSION}/examples
+@dirrm share/doc/${PKGBASE}-${PKGVERSION}
 @dirrm include/upnp
diff --git a/net/libupnp/buildlink3.mk b/net/libupnp/buildlink3.mk
index aa1141569dd..2399be4c3e0 100644
--- a/net/libupnp/buildlink3.mk
+++ b/net/libupnp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2007/06/19 01:40:13 rh Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2007/08/19 01:36:22 obache Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBUPNP_BUILDLINK3_MK:=	${LIBUPNP_BUILDLINK3_MK}+
@@ -12,12 +12,8 @@ BUILDLINK_PACKAGES+=	libupnp
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libupnp
 
 .if ${LIBUPNP_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.libupnp+=	libupnp>1.4.6
+BUILDLINK_API_DEPENDS.libupnp+=	libupnp>=1.4.6
 BUILDLINK_PKGSRCDIR.libupnp?=	../../net/libupnp
-
-PRINT_PLIST_AWK+=	/^@dirrm include\/upnp$$/ { print "@comment in net/libupnp: " $$0; next; }
-PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/include\/upnp$$/ { next; }
-
 .endif	# LIBUPNP_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/net/libupnp/distinfo b/net/libupnp/distinfo
index 86a594a3953..19c8879e0b8 100644
--- a/net/libupnp/distinfo
+++ b/net/libupnp/distinfo
@@ -1,6 +1,10 @@
-$NetBSD: distinfo,v 1.5 2007/06/19 01:40:14 rh Exp $
+$NetBSD: distinfo,v 1.6 2007/08/19 01:36:22 obache Exp $
 
-SHA1 (libupnp-1.6.0-rc1.tar.bz2) = 9c8133d0a4364c73f0fba2bbfb763e019875c747
-RMD160 (libupnp-1.6.0-rc1.tar.bz2) = be3bb874b20859de80a6104d235a8f93f929b559
-Size (libupnp-1.6.0-rc1.tar.bz2) = 1135997 bytes
-SHA1 (patch-ah) = bfe8b269cd7e8ee0f7e4ab0685fe70524960a365
+SHA1 (libupnp-1.6.0.tar.bz2) = 9c8133d0a4364c73f0fba2bbfb763e019875c747
+RMD160 (libupnp-1.6.0.tar.bz2) = be3bb874b20859de80a6104d235a8f93f929b559
+Size (libupnp-1.6.0.tar.bz2) = 1135997 bytes
+SHA1 (patch-aa) = 9ef588b87b54a56dd22e9bdb9fdd8f322338c90a
+SHA1 (patch-ac) = 41ec3e7756d5fefcf9cd3c3072a18b1c132f33e2
+SHA1 (patch-ae) = 7331c61d5b3a47ca3865788cf88a973d5e9352a1
+SHA1 (patch-ag) = b6b555fd2e7d5ddf5f63b25d8b915cdd7d0d03ba
+SHA1 (patch-ah) = 02f0012e2dc4f5cf6ef12340a2be63e4be6e676e
diff --git a/net/libupnp/patches/patch-aa b/net/libupnp/patches/patch-aa
new file mode 100644
index 00000000000..d40dd7ca25f
--- /dev/null
+++ b/net/libupnp/patches/patch-aa
@@ -0,0 +1,22 @@
+$NetBSD: patch-aa,v 1.4 2007/08/19 01:36:22 obache Exp $
+
+--- threadutil/src/ThreadPool.c.orig	2007-06-10 03:48:25.000000000 +0000
++++ threadutil/src/ThreadPool.c
+@@ -96,7 +96,7 @@ SetPolicyType( PolicyType in )
+     #else
+     #ifdef WIN32
+      return sched_setscheduler( 0, in);
+-    #elif defined(_POSIX_PRIORITY_SCHEDULING) && _POSIX_PRIORITY_SCHEDULING > 0
++    #elif defined(_POSIX_PRIORITY_SCHEDULING) && _POSIX_PRIORITY_SCHEDULING >= 200112L
+      struct sched_param current;
+ 
+      sched_getparam( 0, &current );
+@@ -125,7 +125,7 @@ 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;
diff --git a/net/libupnp/patches/patch-ac b/net/libupnp/patches/patch-ac
new file mode 100644
index 00000000000..b0097b7d534
--- /dev/null
+++ b/net/libupnp/patches/patch-ac
@@ -0,0 +1,34 @@
+$NetBSD: patch-ac,v 1.4 2007/08/19 01:36:22 obache Exp $
+
+--- upnp/src/genlib/net/uri/uri.c.orig	2007-06-09 12:53:47.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,
+                                    temp_hostbyname_buff,
+@@ -640,11 +640,16 @@ 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
new file mode 100644
index 00000000000..c131dba1faa
--- /dev/null
+++ b/net/libupnp/patches/patch-ae
@@ -0,0 +1,12 @@
+$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
new file mode 100644
index 00000000000..872a0f20a16
--- /dev/null
+++ b/net/libupnp/patches/patch-ag
@@ -0,0 +1,12 @@
+$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
index a8c95fd8023..425cbb4d5a6 100644
--- a/net/libupnp/patches/patch-ah
+++ b/net/libupnp/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.1 2007/06/12 21:59:32 joerg Exp $
+$NetBSD: patch-ah,v 1.2 2007/08/19 01:36:23 obache Exp $
 
---- threadutil/inc/ithread.h.orig	2007-06-12 21:46:07.000000000 +0000
+--- threadutil/inc/ithread.h.orig	2007-05-25 14:39:38.000000000 +0000
 +++ threadutil/inc/ithread.h
-@@ -51,7 +51,7 @@ extern "C" {
+@@ -45,7 +45,7 @@ extern "C" {
  #define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE
  #endif