diff options
-rw-r--r-- | net/libupnp/Makefile | 16 | ||||
-rw-r--r-- | net/libupnp/PLIST | 258 | ||||
-rw-r--r-- | net/libupnp/distinfo | 18 | ||||
-rw-r--r-- | net/libupnp/patches/patch-aa | 16 | ||||
-rw-r--r-- | net/libupnp/patches/patch-ab | 25 | ||||
-rw-r--r-- | net/libupnp/patches/patch-ac | 56 | ||||
-rw-r--r-- | net/libupnp/patches/patch-af | 30 | ||||
-rw-r--r-- | net/libupnp/patches/patch-ag | 16 |
8 files changed, 364 insertions, 71 deletions
diff --git a/net/libupnp/Makefile b/net/libupnp/Makefile index 2e73d4ce999..8d091175593 100644 --- a/net/libupnp/Makefile +++ b/net/libupnp/Makefile @@ -1,9 +1,10 @@ -# $NetBSD: Makefile,v 1.3 2006/10/13 01:36:07 obache Exp $ +# $NetBSD: Makefile,v 1.4 2007/06/07 08:08:16 rh Exp $ # -DISTNAME= libupnp-1.3.1 +DISTNAME= libupnp-1.4.6 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pupnp/} +EXTRACT_SUFX= .tar.bz2 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://pupnp.sourceforge.net/ @@ -30,5 +31,16 @@ pre-configure: ${LN} -s /usr/include/net/if.h ${BUILDLINK_DIR}/include/linux/if.h .endif +post-install: +.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 + .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/libupnp/PLIST b/net/libupnp/PLIST index c92ab14ccfe..b6f9018392f 100644 --- a/net/libupnp/PLIST +++ b/net/libupnp/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2006/06/03 23:29:24 rh Exp $ +@comment $NetBSD: PLIST,v 1.2 2007/06/07 08:08:16 rh Exp $ include/upnp/FreeList.h include/upnp/LinkedList.h include/upnp/ThreadPool.h @@ -13,4 +13,260 @@ 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} @dirrm include/upnp diff --git a/net/libupnp/distinfo b/net/libupnp/distinfo index 7b45e38a5ce..5ffb3fb9558 100644 --- a/net/libupnp/distinfo +++ b/net/libupnp/distinfo @@ -1,12 +1,12 @@ -$NetBSD: distinfo,v 1.2 2006/06/05 16:26:07 joerg Exp $ +$NetBSD: distinfo,v 1.3 2007/06/07 08:08:16 rh Exp $ -SHA1 (libupnp-1.3.1.tar.gz) = a1fc5a0b250da80e249dbed6aba836b9a2b08972 -RMD160 (libupnp-1.3.1.tar.gz) = 9e02a9189576eedeb336c9af79f068e933d49d55 -Size (libupnp-1.3.1.tar.gz) = 734692 bytes -SHA1 (patch-aa) = 117d657657f1aae4597bb2f9a0d187dfa90c8c83 -SHA1 (patch-ab) = 92c0927e638e2524dfe0190cfb8cf236c6f10903 -SHA1 (patch-ac) = 36f7d2bc43966efbde399c832f6e186900eaaab3 +SHA1 (libupnp-1.4.6.tar.bz2) = eb7d8c725f9813bcaff0eb6a8bc18e43f3c4bc77 +RMD160 (libupnp-1.4.6.tar.bz2) = 022f867a7f4466dcaf1954a4643b7a32c4a7a95e +Size (libupnp-1.4.6.tar.bz2) = 1100044 bytes +SHA1 (patch-aa) = 9b15b84ff8594582cd655d2411e68d27a374c0b7 +SHA1 (patch-ab) = 6a55cd8a7695078bbaca07707b09be996537e032 +SHA1 (patch-ac) = 20ed0e2ec39b0b562961f720eb1b1c3232232506 SHA1 (patch-ad) = 48cf5476743acd415996dc3b065cc7d3cf9b4dbb SHA1 (patch-ae) = e60148122ddd01f8c1020235c58ec7fa3cf7b179 -SHA1 (patch-af) = f039c49bb8dbd27e714895824eab4a18d442dce3 -SHA1 (patch-ag) = e07e61f3c8f0765563055e1d82e1c2cbedd18515 +SHA1 (patch-af) = 323bf256f9c7e0949897e07860dfa890ed5b60f3 +SHA1 (patch-ag) = e13203b590bb671ddf98564cefdb260cccb6bcb9 diff --git a/net/libupnp/patches/patch-aa b/net/libupnp/patches/patch-aa index 3afdabbf0d3..3d9760d0730 100644 --- a/net/libupnp/patches/patch-aa +++ b/net/libupnp/patches/patch-aa @@ -1,12 +1,14 @@ -$NetBSD: patch-aa,v 1.1.1.1 2006/06/03 23:29:24 rh Exp $ +$NetBSD: patch-aa,v 1.2 2007/06/07 08:08:16 rh Exp $ ---- upnp/inc/upnp.h.orig 2006-03-06 03:24:24.000000000 +1000 +--- upnp/inc/upnp.h.orig 2007-03-04 00:58:24.000000000 +1000 +++ upnp/inc/upnp.h -@@ -37,6 +37,7 @@ - //@{ +@@ -45,7 +45,8 @@ + #endif #include <stdio.h> -+#include <time.h> +-#ifdef __FreeBSD__ ++#include <sys/param.h> ++#if (defined(BSD) && BSD >= 199306) + #include <time.h> + #endif #include "ixml.h" - #include "upnpconfig.h" - #if UPNP_HAVE_DEBUG diff --git a/net/libupnp/patches/patch-ab b/net/libupnp/patches/patch-ab index 6b842a793d9..f63c8792e8b 100644 --- a/net/libupnp/patches/patch-ab +++ b/net/libupnp/patches/patch-ab @@ -1,19 +1,8 @@ -$NetBSD: patch-ab,v 1.1.1.1 2006/06/03 23:29:24 rh Exp $ +$NetBSD: patch-ab,v 1.2 2007/06/07 08:08:16 rh Exp $ ---- upnp/src/genlib/net/sock.c.orig 2006-02-23 07:38:03.000000000 +1000 +--- upnp/src/genlib/net/sock.c.orig 2006-10-05 16:19:25.000000000 +1000 +++ upnp/src/genlib/net/sock.c -@@ -49,6 +49,10 @@ - #include <unistd.h> - #include "unixutil.h" - -+#ifndef MSG_NOSIGNAL -+#define MSG_NOSIGNAL 0 -+#endif -+ - /************************************************************************ - * Function : sock_init - * -@@ -223,6 +227,15 @@ sock_read_write( IN SOCKINFO * info, +@@ -231,6 +231,15 @@ sock_read_write( IN SOCKINFO * info, } } @@ -28,10 +17,10 @@ $NetBSD: patch-ab,v 1.1.1.1 2006/06/03 23:29:24 rh Exp $ + if( bRead ) { // read data - numBytes = recv( sockfd, buffer, bufsize, MSG_NOSIGNAL ); -@@ -235,6 +248,9 @@ sock_read_write( IN SOCKINFO * info, + numBytes = recv( sockfd, buffer, bufsize,MSG_NOSIGNAL); +@@ -243,6 +252,9 @@ sock_read_write( IN SOCKINFO * info, send( sockfd, buffer + bytes_sent, byte_left, - MSG_DONTROUTE | MSG_NOSIGNAL ); + MSG_DONTROUTE|MSG_NOSIGNAL); if( num_written == -1 ) { +#ifdef SO_NOSIGPIPE + setsockopt(sockfd, SOL_SOCKET, SO_NOSIGPIPE, &old, olen); @@ -39,7 +28,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2006/06/03 23:29:24 rh Exp $ return num_written; } -@@ -245,6 +261,11 @@ sock_read_write( IN SOCKINFO * info, +@@ -253,6 +265,11 @@ sock_read_write( IN SOCKINFO * info, numBytes = bytes_sent; } diff --git a/net/libupnp/patches/patch-ac b/net/libupnp/patches/patch-ac index ef9be6144ac..af7c6413dfe 100644 --- a/net/libupnp/patches/patch-ac +++ b/net/libupnp/patches/patch-ac @@ -1,14 +1,44 @@ -$NetBSD: patch-ac,v 1.1.1.1 2006/06/03 23:29:24 rh Exp $ +$NetBSD: patch-ac,v 1.2 2007/06/07 08:08:16 rh Exp $ ---- upnp/src/uuid/sysdep.c.orig 2006-02-23 07:38:04.000000000 +1000 -+++ upnp/src/uuid/sysdep.c -@@ -145,7 +145,9 @@ get_random_info( char seed[16] ) - { - MD5_CTX c; - typedef struct { -+#ifdef _SYS_SYSINFO_H - struct sysinfo s; -+#endif - struct timeval t; - char hostname[257]; - } randomness; +--- upnp/src/genlib/net/uri/uri.c.orig 2007-04-28 22:02:33.000000000 +1000 ++++ upnp/src/genlib/net/uri/uri.c +@@ -631,11 +631,38 @@ parse_hostport( const char *in, + if ( h == NULL ) { + errCode = 1; + } +-#else ++#elif defined(__linux__) + errCode = gethostbyname_r( temp_host_name, + &h_buf, + temp_hostbyname_buff, + BUFFER_SIZE, &h, &errcode ); ++#else ++{ ++ struct addrinfo hints, *res, *res0; ++ ++ h = NULL; ++ memset(&hints, 0, sizeof(hints)); ++ hints.ai_family = PF_INET; ++ hints.ai_socktype = SOCK_STREAM; ++ errCode = getaddrinfo(temp_host_name, "http", &hints, &res0); ++ ++ if (!errCode) { ++ for (res = res0; res; res = res->ai_next) { ++ if (res->ai_family == PF_INET && ++ res->ai_addr->sa_family == AF_INET) ++ { ++ h = &h_buf; ++ h->h_addrtype = res->ai_addr->sa_family; ++ h->h_length = 4; ++ h->h_addr = (void *) temp_hostbyname_buff; ++ *(struct in_addr *)h->h_addr = ++ ((struct sockaddr_in *)res->ai_addr)->sin_addr; ++ break; ++ } ++ } ++ freeaddrinfo(res0); ++ } ++} + #endif + + if( errCode == 0 ) { diff --git a/net/libupnp/patches/patch-af b/net/libupnp/patches/patch-af index 13dda887801..187c77ae24b 100644 --- a/net/libupnp/patches/patch-af +++ b/net/libupnp/patches/patch-af @@ -1,17 +1,21 @@ -$NetBSD: patch-af,v 1.1.1.1 2006/06/03 23:29:24 rh Exp $ +$NetBSD: patch-af,v 1.2 2007/06/07 08:08:16 rh Exp $ ---- threadutil/src/ThreadPool.c.orig 2006-02-28 07:48:27.000000000 +1000 +--- threadutil/src/ThreadPool.c.orig 2007-03-13 13:19:24.000000000 +1000 +++ threadutil/src/ThreadPool.c -@@ -339,9 +339,11 @@ tp->stats.totalJobsLQ++; tp->stats.total - *****************************************************************************/ - static void SetSeed( ) { - struct timeb t; -+ volatile union { volatile pthread_t tid; volatile unsigned i; } idu; - - ftime( &t ); -- srand( ( unsigned int )t.millitm + ithread_get_current_thread_id( ) ); -+ idu.tid = ithread_get_current_thread_id(); -+ srand( ( unsigned int )t.millitm + idu.i ); +@@ -354,8 +354,15 @@ tp->stats.totalJobsLQ++; tp->stats.total + srand( ( unsigned int )t.millitm + (unsigned int)ithread_get_current_thread_id( ).p ); + #elif defined(__FreeBSD__) + srand( ( unsigned int )t.millitm + (unsigned int)ithread_get_current_thread_id( ) ); +-#else ++#elif defined(__linux__) + srand( ( unsigned int )t.millitm + ithread_get_current_thread_id( ) ); ++#else ++ { ++ volatile union { volatile pthread_t tid; volatile unsigned i; } idu; ++ ++ idu.tid = ithread_get_current_thread_id(); ++ srand( ( unsigned int )t.millitm + idu.i ); ++ } + #endif } - /**************************************************************************** diff --git a/net/libupnp/patches/patch-ag b/net/libupnp/patches/patch-ag index 4bc0da43ec5..46848dcbdbd 100644 --- a/net/libupnp/patches/patch-ag +++ b/net/libupnp/patches/patch-ag @@ -1,12 +1,12 @@ -$NetBSD: patch-ag,v 1.1 2006/06/05 16:26:07 joerg Exp $ +$NetBSD: patch-ag,v 1.2 2007/06/07 08:08:16 rh Exp $ ---- upnp/src/urlconfig/urlconfig.c.orig 2006-06-05 16:17:49.000000000 +0000 +--- upnp/src/urlconfig/urlconfig.c.orig 2006-12-24 07:13:15.000000000 +1000 +++ upnp/src/urlconfig/urlconfig.c -@@ -31,6 +31,7 @@ - +@@ -32,6 +32,7 @@ #include "config.h" #include <assert.h> -+#include <sys/types.h> - #include <sys/socket.h> - #include <netinet/in.h> - #include <arpa/inet.h> + #ifndef WIN32 ++ #include <sys/types.h> + #include <sys/socket.h> + #include <netinet/in.h> + #include <arpa/inet.h> |