Update SOPE to 2.2.16.

Changes from 2.2.5 are too many to write here.

3 files changed, 281 insertions, 283 deletions

diff --git a/devel/SOPE/Makefile b/devel/SOPE/Makefile
index 3dfc5d25af0..28830ebdce6 100644
--- a/devel/SOPE/Makefile
+++ b/devel/SOPE/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2014/10/07 16:47:21 adam Exp $
+# $NetBSD: Makefile,v 1.21 2015/03/01 13:19:20 taca Exp $
 #
 
-DISTNAME=	SOPE-2.2.5
-PKGREVISION=	1
+DISTNAME=	SOPE-2.2.16
 CATEGORIES=	devel
 MASTER_SITES=	http://www.sogo.nu/files/downloads/SOGo/Sources/
 
diff --git a/devel/SOPE/PLIST b/devel/SOPE/PLIST
index 7f12180b2e6..d8d470ca206 100644
--- a/devel/SOPE/PLIST
+++ b/devel/SOPE/PLIST
@@ -1,32 +1,11 @@
-@comment $NetBSD: PLIST,v 1.2 2012/11/24 14:06:43 manu Exp $
-bin/wod
-bin/load-EOAdaptor
+@comment $NetBSD: PLIST,v 1.3 2015/03/01 13:19:20 taca Exp $
 bin/connect-EOAdaptor
-include/SaxObjC/SaxObjC.h
-include/SaxObjC/SaxAttributeList.h
-include/SaxObjC/SaxAttributes.h
-include/SaxObjC/SaxContentHandler.h
-include/SaxObjC/SaxDTDHandler.h
-include/SaxObjC/SaxDeclHandler.h
-include/SaxObjC/SaxDefaultHandler.h
-include/SaxObjC/SaxDocumentHandler.h
-include/SaxObjC/SaxEntityResolver.h
-include/SaxObjC/SaxErrorHandler.h
-include/SaxObjC/SaxException.h
-include/SaxObjC/SaxHandlerBase.h
-include/SaxObjC/SaxLexicalHandler.h
-include/SaxObjC/SaxLocator.h
-include/SaxObjC/SaxNamespaceSupport.h
-include/SaxObjC/SaxObjectDecoder.h
-include/SaxObjC/SaxObjectModel.h
-include/SaxObjC/SaxXMLFilter.h
-include/SaxObjC/SaxXMLReader.h
-include/SaxObjC/SaxXMLReaderFactory.h
-include/SaxObjC/SaxMethodCallHandler.h
-include/SaxObjC/XMLNamespaces.h
+bin/load-EOAdaptor
+bin/wod
 include/DOM/DOM.h
-include/DOM/DOMProtocols.h
 include/DOM/DOMAttribute.h
+include/DOM/DOMBuilder.h
+include/DOM/DOMBuilderFactory.h
 include/DOM/DOMCDATASection.h
 include/DOM/DOMCharacterData.h
 include/DOM/DOMComment.h
@@ -37,27 +16,21 @@ include/DOM/DOMElement.h
 include/DOM/DOMEntity.h
 include/DOM/DOMEntityReference.h
 include/DOM/DOMImplementation.h
+include/DOM/DOMNamedNodeMap.h
+include/DOM/DOMNode+Enum.h
+include/DOM/DOMNode+QueryPath.h
 include/DOM/DOMNode.h
+include/DOM/DOMNodeWalker.h
 include/DOM/DOMNotation.h
+include/DOM/DOMPYXOutputter.h
 include/DOM/DOMProcessingInstruction.h
-include/DOM/DOMBuilder.h
-include/DOM/DOMBuilderFactory.h
-include/DOM/EDOM.h
-include/DOM/DOMNode+Enum.h
-include/DOM/DOMNode+QueryPath.h
+include/DOM/DOMProtocols.h
 include/DOM/DOMQueryPathExpression.h
 include/DOM/DOMSaxBuilder.h
 include/DOM/DOMSaxHandler.h
 include/DOM/DOMText.h
 include/DOM/DOMXMLOutputter.h
-include/DOM/DOMPYXOutputter.h
-include/DOM/DOMNodeWalker.h
-include/DOM/DOMNamedNodeMap.h
-include/XmlRpc/XmlRpc.h
-include/XmlRpc/NSObject+XmlRpc.h
-include/XmlRpc/XmlRpcCoder.h
-include/XmlRpc/XmlRpcMethodCall.h
-include/XmlRpc/XmlRpcMethodResponse.h
+include/DOM/EDOM.h
 include/EOControl/EOArrayDataSource.h
 include/EOControl/EOClassDescription.h
 include/EOControl/EOControl.h
@@ -73,30 +46,98 @@ include/EOControl/EOKeyValueCoding.h
 include/EOControl/EONull.h
 include/EOControl/EOObserver.h
 include/EOControl/EOQualifier.h
-include/EOControl/EOSortOrdering.h
 include/EOControl/EOSQLParser.h
-include/NGExtensions/NGExtensionsDecls.h
-include/NGExtensions/NGExtensions.h
+include/EOControl/EOSortOrdering.h
+include/GDLAccess/EOAdaptor.h
+include/GDLAccess/EOAdaptorChannel+Attributes.h
+include/GDLAccess/EOAdaptorChannel.h
+include/GDLAccess/EOAdaptorContext.h
+include/GDLAccess/EOAdaptorDataSource.h
+include/GDLAccess/EOAdaptorGlobalID.h
+include/GDLAccess/EOAdaptorOperation.h
+include/GDLAccess/EOArrayProxy.h
+include/GDLAccess/EOAttribute.h
+include/GDLAccess/EOAttributeOrdering.h
+include/GDLAccess/EOCustomValues.h
+include/GDLAccess/EODatabase.h
+include/GDLAccess/EODatabaseChannel.h
+include/GDLAccess/EODatabaseContext.h
+include/GDLAccess/EODatabaseFault.h
+include/GDLAccess/EODatabaseFaultResolver.h
+include/GDLAccess/EODelegateResponse.h
+include/GDLAccess/EOEntity+Factory.h
+include/GDLAccess/EOEntity.h
+include/GDLAccess/EOExpressionArray.h
+include/GDLAccess/EOFExceptions.h
+include/GDLAccess/EOFault.h
+include/GDLAccess/EOFaultHandler.h
+include/GDLAccess/EOGenericRecord.h
+include/GDLAccess/EOJoinTypes.h
+include/GDLAccess/EOKeySortOrdering.h
+include/GDLAccess/EOModel.h
+include/GDLAccess/EOModelGroup.h
+include/GDLAccess/EONull.h
+include/GDLAccess/EOObjectUniquer.h
+include/GDLAccess/EOPrimaryKeyDictionary.h
+include/GDLAccess/EOQuotedExpression.h
+include/GDLAccess/EORecordDictionary.h
+include/GDLAccess/EORelationship.h
+include/GDLAccess/EOSQLExpression.h
+include/GDLAccess/EOSQLQualifier.h
+include/GDLAccess/GDLAccess.h
+include/GDLAccess/NSObject+EONullInit.h
 include/NGExtensions/AutoDefines.h
+include/NGExtensions/DOMNode+EOQualifier.h
+include/NGExtensions/EOCacheDataSource.h
+include/NGExtensions/EOCompoundDataSource.h
+include/NGExtensions/EODataSource+NGExtensions.h
+include/NGExtensions/EOFetchSpecification+plist.h
+include/NGExtensions/EOFilterDataSource.h
+include/NGExtensions/EOGrouping.h
+include/NGExtensions/EOGroupingSet.h
+include/NGExtensions/EOKeyGrouping.h
+include/NGExtensions/EOKeyMapDataSource.h
+include/NGExtensions/EOQualifier+CtxEval.h
+include/NGExtensions/EOQualifier+plist.h
+include/NGExtensions/EOQualifierGrouping.h
+include/NGExtensions/EOSortOrdering+plist.h
+include/NGExtensions/EOTrueQualifier.h
 include/NGExtensions/IndexFunc.h
 include/NGExtensions/NGBase64Coding.h
 include/NGExtensions/NGBaseTypes.h
 include/NGExtensions/NGBitSet.h
 include/NGExtensions/NGBundleManager.h
+include/NGExtensions/NGCalendarDateRange.h
 include/NGExtensions/NGCharBuffers.h
 include/NGExtensions/NGCustomFileManager.h
 include/NGExtensions/NGDirectoryEnumerator.h
+include/NGExtensions/NGExtensions.h
+include/NGExtensions/NGExtensionsDecls.h
 include/NGExtensions/NGFileFolderInfoDataSource.h
 include/NGExtensions/NGFileManager.h
 include/NGExtensions/NGFileManagerURL.h
 include/NGExtensions/NGHashMap.h
+include/NGExtensions/NGLogAppender.h
+include/NGExtensions/NGLogEvent.h
+include/NGExtensions/NGLogEventFormatter.h
+include/NGExtensions/NGLogFileHandleAppender.h
+include/NGExtensions/NGLogLevel.h
+include/NGExtensions/NGLogSyslogAppender.h
+include/NGExtensions/NGLogger.h
+include/NGExtensions/NGLoggerManager.h
+include/NGExtensions/NGLogging.h
 include/NGExtensions/NGMemoryAllocation.h
 include/NGExtensions/NGMerging.h
-include/NGExtensions/NGQuotedPrintableCoding.h
-include/NGExtensions/NGStack.h
 include/NGExtensions/NGObjectMacros.h
-include/NGExtensions/NGCalendarDateRange.h
+include/NGExtensions/NGPropertyListParser.h
+include/NGExtensions/NGQuotedPrintableCoding.h
 include/NGExtensions/NGResourceLocator.h
+include/NGExtensions/NGRule.h
+include/NGExtensions/NGRuleAssignment.h
+include/NGExtensions/NGRuleContext.h
+include/NGExtensions/NGRuleEngine.h
+include/NGExtensions/NGRuleModel.h
+include/NGExtensions/NGStack.h
 include/NGExtensions/NSArray+enumerator.h
 include/NGExtensions/NSAutoreleasePool+misc.h
 include/NGExtensions/NSBundle+misc.h
@@ -113,210 +154,161 @@ include/NGExtensions/NSObject+Values.h
 include/NGExtensions/NSProcessInfo+misc.h
 include/NGExtensions/NSRunLoop+FileObjects.h
 include/NGExtensions/NSSet+enumerator.h
-include/NGExtensions/NSString+Ext.h
-include/NGExtensions/NSString+German.h
-include/NGExtensions/NSString+Formatting.h
 include/NGExtensions/NSString+Encoding.h
 include/NGExtensions/NSString+Escaping.h
+include/NGExtensions/NSString+Ext.h
+include/NGExtensions/NSString+Formatting.h
 include/NGExtensions/NSString+misc.h
 include/NGExtensions/NSURL+misc.h
-include/NGExtensions/NGPropertyListParser.h
-include/NGExtensions/EOCacheDataSource.h
-include/NGExtensions/EOCompoundDataSource.h
-include/NGExtensions/EODataSource+NGExtensions.h
-include/NGExtensions/EOFilterDataSource.h
-include/NGExtensions/EOGrouping.h
-include/NGExtensions/EOGroupingSet.h
-include/NGExtensions/EOKeyGrouping.h
-include/NGExtensions/EOKeyMapDataSource.h
-include/NGExtensions/EOQualifier+CtxEval.h
-include/NGExtensions/EOQualifierGrouping.h
-include/NGExtensions/EOTrueQualifier.h
-include/NGExtensions/EOQualifier+plist.h
-include/NGExtensions/EOSortOrdering+plist.h
-include/NGExtensions/EOFetchSpecification+plist.h
-include/NGExtensions/DOMNode+EOQualifier.h
-include/NGExtensions/NGRuleEngine.h
-include/NGExtensions/NGRule.h
-include/NGExtensions/NGRuleAssignment.h
-include/NGExtensions/NGRuleContext.h
-include/NGExtensions/NGRuleModel.h
-include/NGExtensions/NGLogging.h
-include/NGExtensions/NGLogLevel.h
-include/NGExtensions/NGLogger.h
-include/NGExtensions/NGLoggerManager.h
-include/NGExtensions/NGLogEvent.h
-include/NGExtensions/NGLogEventFormatter.h
-include/NGExtensions/NGLogAppender.h
-include/NGExtensions/NGLogFileHandleAppender.h
-include/NGExtensions/NGLogSyslogAppender.h
-include/NGStreams/NGStreamsDecls.h
-include/NGStreams/NGStreams.h
-include/NGStreams/NGStreamProtocols.h
-include/NGStreams/NGTextStreamProtocols.h
-include/NGStreams/NGBase64Stream.h
-include/NGStreams/NGBufferedStream.h
-include/NGStreams/NGByteCountStream.h
-include/NGStreams/NGCTextStream.h
-include/NGStreams/NGConcreteStreamFileHandle.h
-include/NGStreams/NGDataStream.h
-include/NGStreams/NGFileStream.h
-include/NGStreams/NGFilterStream.h
-include/NGStreams/NGFilterTextStream.h
-include/NGStreams/NGLockingStream.h
-include/NGStreams/NGStream.h
-include/NGStreams/NGStreamExceptions.h
-include/NGStreams/NGStringTextStream.h
-include/NGStreams/NGTextStream.h
-include/NGStreams/NGDescriptorFunctions.h
-include/NGStreams/NGStreamPipe.h
-include/NGStreams/NGByteBuffer.h
-include/NGStreams/NGCharBuffer.h
-include/NGStreams/NGTerminalSupport.h
-include/NGStreams/NGActiveSocket.h
-include/NGStreams/NGDatagramPacket.h
-include/NGStreams/NGDatagramSocket.h
-include/NGStreams/NGInternetSocketAddress.h
-include/NGStreams/NGInternetSocketDomain.h
-include/NGStreams/NGLocalSocketAddress.h
-include/NGStreams/NGLocalSocketDomain.h
-include/NGStreams/NGNet.h
-include/NGStreams/NGNetDecls.h
-include/NGStreams/NGNetUtilities.h
-include/NGStreams/NGPassiveSocket.h
-include/NGStreams/NGSocket.h
-include/NGStreams/NGSocketExceptions.h
-include/NGStreams/NGSocketProtocols.h
-include/NGStreams/NGGZipStream.h
-include/NGMime/NGMimeDecls.h
-include/NGMime/NGMime.h
+include/NGHttp/NGHttp.h
+include/NGHttp/NGHttpBodyParser.h
+include/NGHttp/NGHttpCookie.h
+include/NGHttp/NGHttpDecls.h
+include/NGHttp/NGHttpHeaderFieldParser.h
+include/NGHttp/NGHttpHeaderFields.h
+include/NGHttp/NGHttpMessage.h
+include/NGHttp/NGHttpMessageParser.h
+include/NGHttp/NGHttpRequest.h
+include/NGHttp/NGHttpResponse.h
+include/NGHttp/NGUrlFormCoder.h
+include/NGImap4/NGImap4.h
+include/NGImap4/NGImap4Client.h
+include/NGImap4/NGImap4Connection.h
+include/NGImap4/NGImap4ConnectionManager.h
+include/NGImap4/NGImap4Context.h
+include/NGImap4/NGImap4DataSource.h
+include/NGImap4/NGImap4Envelope.h
+include/NGImap4/NGImap4EnvelopeAddress.h
+include/NGImap4/NGImap4FileManager.h
+include/NGImap4/NGImap4Folder.h
+include/NGImap4/NGImap4MailboxInfo.h
+include/NGImap4/NGImap4Message.h
+include/NGImap4/NGImap4ResponseParser.h
+include/NGImap4/NGImap4ServerRoot.h
+include/NGImap4/NGImap4Support.h
+include/NGImap4/NGSieveClient.h
+include/NGImap4/NSString+Imap4.h
+include/NGLdap/EOQualifier+LDAP.h
+include/NGLdap/NGLdap.h
+include/NGLdap/NGLdapAttribute.h
+include/NGLdap/NGLdapConnection.h
+include/NGLdap/NGLdapDataSource.h
+include/NGLdap/NGLdapEntry.h
+include/NGLdap/NGLdapFileManager.h
+include/NGLdap/NGLdapGlobalID.h
+include/NGLdap/NGLdapModification.h
+include/NGLdap/NGLdapSearchResultEnumerator.h
+include/NGLdap/NGLdapURL.h
+include/NGLdap/NSString+DN.h
+include/NGMail/NGMBoxReader.h
+include/NGMail/NGMail.h
+include/NGMail/NGMailAddress.h
+include/NGMail/NGMailAddressList.h
+include/NGMail/NGMailAddressParser.h
+include/NGMail/NGMailDecls.h
+include/NGMail/NGMimeMessage.h
+include/NGMail/NGMimeMessageGenerator.h
+include/NGMail/NGMimeMessageParser.h
+include/NGMail/NGPop3Client.h
+include/NGMail/NGPop3Support.h
+include/NGMail/NGSendMail.h
+include/NGMail/NGSmtpClient.h
+include/NGMail/NGSmtpSupport.h
 include/NGMime/NGConcreteMimeType.h
+include/NGMime/NGMime.h
 include/NGMime/NGMimeBodyGenerator.h
 include/NGMime/NGMimeBodyParser.h
 include/NGMime/NGMimeBodyPart.h
 include/NGMime/NGMimeBodyPartParser.h
+include/NGMime/NGMimeDecls.h
 include/NGMime/NGMimeExceptions.h
+include/NGMime/NGMimeFileData.h
 include/NGMime/NGMimeGeneratorProtocols.h
 include/NGMime/NGMimeHeaderFieldGenerator.h
 include/NGMime/NGMimeHeaderFieldParser.h
 include/NGMime/NGMimeHeaderFields.h
+include/NGMime/NGMimeJoinedData.h
 include/NGMime/NGMimeMultipartBody.h
 include/NGMime/NGMimePartGenerator.h
 include/NGMime/NGMimePartParser.h
 include/NGMime/NGMimeType.h
 include/NGMime/NGMimeUtilities.h
 include/NGMime/NGPart.h
-include/NGMime/NGMimeFileData.h
-include/NGMime/NGMimeJoinedData.h
 include/NGMime/NSData+RFC822.h
-include/NGMail/NGMailDecls.h
-include/NGMail/NGMail.h
-include/NGMail/NGMailAddressList.h
-include/NGMail/NGMailAddressParser.h
-include/NGMail/NGMailAddress.h
-include/NGMail/NGMimeMessage.h
-include/NGMail/NGMimeMessageGenerator.h
-include/NGMail/NGMimeMessageParser.h
-include/NGMail/NGMBoxReader.h
-include/NGMail/NGPop3Client.h
-include/NGMail/NGPop3Support.h
-include/NGMail/NGSmtpClient.h
-include/NGMail/NGSmtpSupport.h
-include/NGMail/NGSendMail.h
-include/NGImap4/NGImap4ResponseParser.h
-include/NGImap4/NGImap4Client.h
-include/NGImap4/NGImap4Support.h
-include/NGImap4/NGImap4Folder.h
-include/NGImap4/NGImap4Context.h
-include/NGImap4/NGImap4Message.h
-include/NGImap4/NGImap4ServerRoot.h
-include/NGImap4/NGImap4FileManager.h
-include/NGImap4/NGImap4.h
-include/NGImap4/NGImap4DataSource.h
-include/NGImap4/NSString+Imap4.h
-include/NGImap4/NGSieveClient.h
-include/NGImap4/NGImap4Envelope.h
-include/NGImap4/NGImap4EnvelopeAddress.h
-include/NGImap4/NGImap4Connection.h
-include/NGImap4/NGImap4MailboxInfo.h
-include/NGImap4/NGImap4ConnectionManager.h
-include/NGHttp/NGHttpDecls.h
-include/NGHttp/NGHttp.h
-include/NGHttp/NGHttpCookie.h
-include/NGHttp/NGHttpHeaderFieldParser.h
-include/NGHttp/NGHttpHeaderFields.h
-include/NGHttp/NGHttpBodyParser.h
-include/NGHttp/NGHttpMessage.h
-include/NGHttp/NGHttpMessageParser.h
-include/NGHttp/NGHttpRequest.h
-include/NGHttp/NGHttpResponse.h
-include/NGHttp/NGUrlFormCoder.h
-include/NGObjWeb/SoObjects.h
+include/NGObjWeb/EOFetchSpecification+SoDAV.h
+include/NGObjWeb/NGObjWeb.h
+include/NGObjWeb/NGObjWebDecls.h
 include/NGObjWeb/NSException+HTTP.h
+include/NGObjWeb/NSString+JavaScriptEscaping.h
+include/NGObjWeb/OWResourceManager.h
+include/NGObjWeb/OWResponder.h
+include/NGObjWeb/OWViewRequestHandler.h
+include/NGObjWeb/SaxDAVHandler.h
+include/NGObjWeb/SoActionInvocation.h
+include/NGObjWeb/SoApplication.h
 include/NGObjWeb/SoClass.h
 include/NGObjWeb/SoClassRegistry.h
 include/NGObjWeb/SoClassSecurityInfo.h
+include/NGObjWeb/SoComponent.h
+include/NGObjWeb/SoControlPanel.h
+include/NGObjWeb/SoCookieAuthenticator.h
+include/NGObjWeb/SoDAV.h
+include/NGObjWeb/SoDAVLockManager.h
+include/NGObjWeb/SoDAVSQLParser.h
 include/NGObjWeb/SoDefaultRenderer.h
 include/NGObjWeb/SoHTTPAuthenticator.h
+include/NGObjWeb/SoLookupAssociation.h
 include/NGObjWeb/SoObjCClass.h
+include/NGObjWeb/SoObject+SoDAV.h
 include/NGObjWeb/SoObject.h
+include/NGObjWeb/SoObjectDataSource.h
 include/NGObjWeb/SoObjectMethodDispatcher.h
 include/NGObjWeb/SoObjectRequestHandler.h
+include/NGObjWeb/SoObjectResultEntry.h
+include/NGObjWeb/SoObjectWebDAVDispatcher.h
+include/NGObjWeb/SoObjects.h
 include/NGObjWeb/SoPageInvocation.h
-include/NGObjWeb/SoActionInvocation.h
 include/NGObjWeb/SoPermissions.h
 include/NGObjWeb/SoProduct.h
 include/NGObjWeb/SoProductClassInfo.h
+include/NGObjWeb/SoProductLoader.h
 include/NGObjWeb/SoProductRegistry.h
-include/NGObjWeb/SoUser.h
 include/NGObjWeb/SoProductResourceManager.h
+include/NGObjWeb/SoSecurityException.h
 include/NGObjWeb/SoSecurityManager.h
 include/NGObjWeb/SoSelectorInvocation.h
-include/NGObjWeb/WOContext+SoObjects.h
-include/NGObjWeb/WORequest+So.h
-include/NGObjWeb/SoControlPanel.h
-include/NGObjWeb/SoApplication.h
-include/NGObjWeb/SoLookupAssociation.h
-include/NGObjWeb/SoTemplateRenderer.h
 include/NGObjWeb/SoSubContext.h
-include/NGObjWeb/SoSecurityException.h
-include/NGObjWeb/SoComponent.h
-include/NGObjWeb/SoProductLoader.h
-include/NGObjWeb/SoCookieAuthenticator.h
-include/NGObjWeb/SoDAV.h
-include/NGObjWeb/EOFetchSpecification+SoDAV.h
-include/NGObjWeb/SaxDAVHandler.h
-include/NGObjWeb/SoWebDAVValue.h
-include/NGObjWeb/SoDAVLockManager.h
-include/NGObjWeb/SoObject+SoDAV.h
-include/NGObjWeb/SoObjectDataSource.h
-include/NGObjWeb/SoObjectResultEntry.h
-include/NGObjWeb/SoObjectWebDAVDispatcher.h
-include/NGObjWeb/SoWebDAVRenderer.h
-include/NGObjWeb/SoSubscriptionManager.h
 include/NGObjWeb/SoSubscription.h
-include/NGObjWeb/SoDAVSQLParser.h
-include/NGObjWeb/NGObjWebDecls.h
-include/NGObjWeb/NGObjWeb.h
-include/NGObjWeb/OWResponder.h
-include/NGObjWeb/OWViewRequestHandler.h
-include/NGObjWeb/OWResourceManager.h
+include/NGObjWeb/SoSubscriptionManager.h
+include/NGObjWeb/SoTemplateRenderer.h
+include/NGObjWeb/SoUser.h
+include/NGObjWeb/SoWebDAVRenderer.h
+include/NGObjWeb/SoWebDAVValue.h
 include/NGObjWeb/WEClientCapabilities.h
 include/NGObjWeb/WOActionResults.h
+include/NGObjWeb/WOActionURL.h
 include/NGObjWeb/WOAdaptor.h
 include/NGObjWeb/WOApplication.h
-include/NGObjWeb/WOCoreApplication.h
 include/NGObjWeb/WOAssociation.h
 include/NGObjWeb/WOComponent.h
+include/NGObjWeb/WOComponentDefinition.h
+include/NGObjWeb/WOComponentScript.h
+include/NGObjWeb/WOContext+SoObjects.h
 include/NGObjWeb/WOContext.h
 include/NGObjWeb/WOCookie.h
+include/NGObjWeb/WOCoreApplication.h
 include/NGObjWeb/WODirectAction.h
 include/NGObjWeb/WODisplayGroup.h
 include/NGObjWeb/WODynamicElement.h
 include/NGObjWeb/WOElement.h
+include/NGObjWeb/WOElementTrackingContext.h
+include/NGObjWeb/WOHTMLDynamicElement.h
 include/NGObjWeb/WOHTTPConnection.h
 include/NGObjWeb/WOMailDelivery.h
 include/NGObjWeb/WOMessage.h
+include/NGObjWeb/WOPageGenerationContext.h
+include/NGObjWeb/WOProxyRequestHandler.h
+include/NGObjWeb/WORequest+So.h
 include/NGObjWeb/WORequest.h
 include/NGObjWeb/WORequestHandler.h
 include/NGObjWeb/WOResourceManager.h
@@ -324,99 +316,111 @@ include/NGObjWeb/WOResponse.h
 include/NGObjWeb/WOSession.h
 include/NGObjWeb/WOSessionStore.h
 include/NGObjWeb/WOStatisticsStore.h
+include/NGObjWeb/WOTemplate.h
 include/NGObjWeb/WOTemplateBuilder.h
 include/NGObjWeb/WOxElemBuilder.h
-include/NGObjWeb/WOTemplate.h
-include/NGObjWeb/WOComponentScript.h
-include/NGObjWeb/WOProxyRequestHandler.h
-include/NGObjWeb/WOPageGenerationContext.h
-include/NGObjWeb/WOElementTrackingContext.h
-include/NGObjWeb/WOComponentDefinition.h
-include/NGObjWeb/NSString+JavaScriptEscaping.h
-include/NGObjWeb/WOHTMLDynamicElement.h
-include/NGObjWeb/WOActionURL.h
-include/WEExtensions/WEContextConditional.h
-include/WEExtensions/WEResourceManager.h
-include/WOExtensions/WOExtensions.h
-include/WOExtensions/WORedirect.h
-include/GDLAccess/GDLAccess.h
-include/GDLAccess/EODelegateResponse.h
-include/GDLAccess/EOJoinTypes.h
-include/GDLAccess/EOAdaptor.h
-include/GDLAccess/EOAdaptorChannel.h
-include/GDLAccess/EOAdaptorContext.h
-include/GDLAccess/EOArrayProxy.h
-include/GDLAccess/EOAttribute.h
-include/GDLAccess/EOAttributeOrdering.h
-include/GDLAccess/EOCustomValues.h
-include/GDLAccess/EODatabase.h
-include/GDLAccess/EODatabaseChannel.h
-include/GDLAccess/EODatabaseContext.h
-include/GDLAccess/EOEntity.h
-include/GDLAccess/EOExpressionArray.h
-include/GDLAccess/EOFExceptions.h
-include/GDLAccess/EODatabaseFault.h
-include/GDLAccess/EODatabaseFaultResolver.h
-include/GDLAccess/EOModel.h
-include/GDLAccess/EOObjectUniquer.h
-include/GDLAccess/EOPrimaryKeyDictionary.h
-include/GDLAccess/EOSQLQualifier.h
-include/GDLAccess/EOQuotedExpression.h
-include/GDLAccess/EORelationship.h
-include/GDLAccess/EOSQLExpression.h
-include/GDLAccess/EOGenericRecord.h
-include/GDLAccess/EOModelGroup.h
-include/GDLAccess/EONull.h
-include/GDLAccess/EOKeySortOrdering.h
-include/GDLAccess/EOAdaptorDataSource.h
-include/GDLAccess/EOAdaptorChannel+Attributes.h
-include/GDLAccess/EOAdaptorOperation.h
-include/GDLAccess/EOAdaptorGlobalID.h
-include/GDLAccess/NSObject+EONullInit.h
-include/GDLAccess/EOEntity+Factory.h
-include/GDLAccess/EOFault.h
-include/GDLAccess/EORecordDictionary.h
-include/GDLAccess/EOFaultHandler.h
-include/SBJson/SBJson.h
+include/NGStreams/NGActiveSocket.h
+include/NGStreams/NGBase64Stream.h
+include/NGStreams/NGBufferedStream.h
+include/NGStreams/NGByteBuffer.h
+include/NGStreams/NGByteCountStream.h
+include/NGStreams/NGCTextStream.h
+include/NGStreams/NGCharBuffer.h
+include/NGStreams/NGConcreteStreamFileHandle.h
+include/NGStreams/NGDataStream.h
+include/NGStreams/NGDatagramPacket.h
+include/NGStreams/NGDatagramSocket.h
+include/NGStreams/NGDescriptorFunctions.h
+include/NGStreams/NGFileStream.h
+include/NGStreams/NGFilterStream.h
+include/NGStreams/NGFilterTextStream.h
+include/NGStreams/NGGZipStream.h
+include/NGStreams/NGInternetSocketAddress.h
+include/NGStreams/NGInternetSocketDomain.h
+include/NGStreams/NGLocalSocketAddress.h
+include/NGStreams/NGLocalSocketDomain.h
+include/NGStreams/NGLockingStream.h
+include/NGStreams/NGNet.h
+include/NGStreams/NGNetDecls.h
+include/NGStreams/NGNetUtilities.h
+include/NGStreams/NGPassiveSocket.h
+include/NGStreams/NGSocket.h
+include/NGStreams/NGSocketExceptions.h
+include/NGStreams/NGSocketProtocols.h
+include/NGStreams/NGStream.h
+include/NGStreams/NGStreamExceptions.h
+include/NGStreams/NGStreamPipe.h
+include/NGStreams/NGStreamProtocols.h
+include/NGStreams/NGStreams.h
+include/NGStreams/NGStreamsDecls.h
+include/NGStreams/NGStringTextStream.h
+include/NGStreams/NGTerminalSupport.h
+include/NGStreams/NGTextStream.h
+include/NGStreams/NGTextStreamProtocols.h
 include/SBJson/NSObject+SBJSON.h
 include/SBJson/NSString+SBJSON.h
+include/SBJson/SBJson.h
 include/SBJson/SBJsonBase.h
 include/SBJson/SBJsonParser.h
 include/SBJson/SBJsonWriter.h
-include/NGLdap/NGLdap.h
-include/NGLdap/EOQualifier+LDAP.h
-include/NGLdap/NSString+DN.h
-include/NGLdap/NGLdapEntry.h
-include/NGLdap/NGLdapConnection.h
-include/NGLdap/NGLdapAttribute.h
-include/NGLdap/NGLdapModification.h
-include/NGLdap/NGLdapSearchResultEnumerator.h
-include/NGLdap/NGLdapURL.h
-include/NGLdap/NGLdapGlobalID.h
-include/NGLdap/NGLdapFileManager.h
-include/NGLdap/NGLdapDataSource.h
-lib/libSaxObjC.so.4.9.66
-lib/libDOM.so.4.9.24
-lib/libXmlRpc.so.4.9.31
-lib/GNUstep/SaxDrivers-4.9/STXSaxDriver.sax/Resources/Version
+include/SaxObjC/SaxAttributeList.h
+include/SaxObjC/SaxAttributes.h
+include/SaxObjC/SaxContentHandler.h
+include/SaxObjC/SaxDTDHandler.h
+include/SaxObjC/SaxDeclHandler.h
+include/SaxObjC/SaxDefaultHandler.h
+include/SaxObjC/SaxDocumentHandler.h
+include/SaxObjC/SaxEntityResolver.h
+include/SaxObjC/SaxErrorHandler.h
+include/SaxObjC/SaxException.h
+include/SaxObjC/SaxHandlerBase.h
+include/SaxObjC/SaxLexicalHandler.h
+include/SaxObjC/SaxLocator.h
+include/SaxObjC/SaxMethodCallHandler.h
+include/SaxObjC/SaxNamespaceSupport.h
+include/SaxObjC/SaxObjC.h
+include/SaxObjC/SaxObjectDecoder.h
+include/SaxObjC/SaxObjectModel.h
+include/SaxObjC/SaxXMLFilter.h
+include/SaxObjC/SaxXMLReader.h
+include/SaxObjC/SaxXMLReaderFactory.h
+include/SaxObjC/XMLNamespaces.h
+include/WEExtensions/WEContextConditional.h
+include/WEExtensions/WEResourceManager.h
+include/WOExtensions/WOExtensions.h
+include/WOExtensions/WORedirect.h
+include/XmlRpc/NSObject+XmlRpc.h
+include/XmlRpc/XmlRpc.h
+include/XmlRpc/XmlRpcCoder.h
+include/XmlRpc/XmlRpcMethodCall.h
+include/XmlRpc/XmlRpcMethodResponse.h
+lib/GNUstep/GDLAdaptors-4.9/MySQL.gdladaptor/MySQL
+lib/GNUstep/GDLAdaptors-4.9/MySQL.gdladaptor/Resources/Info-gnustep.plist
+lib/GNUstep/GDLAdaptors-4.9/MySQL.gdladaptor/Resources/Version
+lib/GNUstep/GDLAdaptors-4.9/MySQL.gdladaptor/stamp.make
+lib/GNUstep/GDLAdaptors-4.9/PostgreSQL.gdladaptor/PostgreSQL
+lib/GNUstep/GDLAdaptors-4.9/PostgreSQL.gdladaptor/Resources/Info-gnustep.plist
+lib/GNUstep/GDLAdaptors-4.9/PostgreSQL.gdladaptor/Resources/Version
+lib/GNUstep/GDLAdaptors-4.9/PostgreSQL.gdladaptor/stamp.make
+lib/GNUstep/Libraries/Resources/NGObjWeb/DAVPropMap.plist
+lib/GNUstep/Libraries/Resources/NGObjWeb/Defaults.plist
+lib/GNUstep/Libraries/Resources/NGObjWeb/Languages.plist
 lib/GNUstep/SaxDrivers-4.9/STXSaxDriver.sax/Resources/Info-gnustep.plist
+lib/GNUstep/SaxDrivers-4.9/STXSaxDriver.sax/Resources/Version
 lib/GNUstep/SaxDrivers-4.9/STXSaxDriver.sax/STXSaxDriver
 lib/GNUstep/SaxDrivers-4.9/STXSaxDriver.sax/bundle-info.plist
 lib/GNUstep/SaxDrivers-4.9/STXSaxDriver.sax/stamp.make
-lib/GNUstep/SaxDrivers-4.9/libxmlSAXDriver.sax/Resources/bundle-info.plist
-lib/GNUstep/SaxDrivers-4.9/libxmlSAXDriver.sax/Resources/Version
 lib/GNUstep/SaxDrivers-4.9/libxmlSAXDriver.sax/Resources/Info-gnustep.plist
-lib/GNUstep/SaxDrivers-4.9/libxmlSAXDriver.sax/libxmlSAXDriver
+lib/GNUstep/SaxDrivers-4.9/libxmlSAXDriver.sax/Resources/Version
+lib/GNUstep/SaxDrivers-4.9/libxmlSAXDriver.sax/Resources/bundle-info.plist
 lib/GNUstep/SaxDrivers-4.9/libxmlSAXDriver.sax/bundle-info.plist
+lib/GNUstep/SaxDrivers-4.9/libxmlSAXDriver.sax/libxmlSAXDriver
 lib/GNUstep/SaxDrivers-4.9/libxmlSAXDriver.sax/stamp.make
 lib/GNUstep/SoProducts-4.9/SoCore.sxp/Resources/Info-gnustep.plist
-lib/GNUstep/SoProducts-4.9/SoCore.sxp/Resources/product.plist
 lib/GNUstep/SoProducts-4.9/SoCore.sxp/Resources/Version
+lib/GNUstep/SoProducts-4.9/SoCore.sxp/Resources/product.plist
 lib/GNUstep/SoProducts-4.9/SoCore.sxp/SoCore
 lib/GNUstep/SoProducts-4.9/SoCore.sxp/stamp.make
-lib/GNUstep/Libraries/Resources/NGObjWeb/Defaults.plist
-lib/GNUstep/Libraries/Resources/NGObjWeb/Languages.plist
-lib/GNUstep/Libraries/Resources/NGObjWeb/DAVPropMap.plist
 lib/GNUstep/WOxElemBuilders-4.9/WEExtensions.wox/Resources/Info-gnustep.plist
 lib/GNUstep/WOxElemBuilders-4.9/WEExtensions.wox/WEExtensions
 lib/GNUstep/WOxElemBuilders-4.9/WEExtensions.wox/bundle-info.plist
@@ -425,15 +429,8 @@ lib/GNUstep/WOxElemBuilders-4.9/WOExtensions.wox/Resources/Info-gnustep.plist
 lib/GNUstep/WOxElemBuilders-4.9/WOExtensions.wox/WOExtensions
 lib/GNUstep/WOxElemBuilders-4.9/WOExtensions.wox/bundle-info.plist
 lib/GNUstep/WOxElemBuilders-4.9/WOExtensions.wox/stamp.make
-lib/GNUstep/GDLAdaptors-4.9/PostgreSQL.gdladaptor/Resources/Version
-lib/GNUstep/GDLAdaptors-4.9/PostgreSQL.gdladaptor/Resources/Info-gnustep.plist
-lib/GNUstep/GDLAdaptors-4.9/PostgreSQL.gdladaptor/PostgreSQL
-lib/GNUstep/GDLAdaptors-4.9/PostgreSQL.gdladaptor/stamp.make
-lib/GNUstep/GDLAdaptors-4.9/MySQL.gdladaptor/Resources/Version
-lib/GNUstep/GDLAdaptors-4.9/MySQL.gdladaptor/Resources/Info-gnustep.plist
-lib/GNUstep/GDLAdaptors-4.9/MySQL.gdladaptor/MySQL
-lib/GNUstep/GDLAdaptors-4.9/MySQL.gdladaptor/stamp.make
 lib/libDOM.so
+lib/libDOM.so.4.9.24
 lib/libEOControl.so
 lib/libEOControl.so.4.9.74
 lib/libGDLAccess.so
@@ -451,11 +448,13 @@ lib/libNGStreams.so.4.9.57
 lib/libSBJson.so
 lib/libSBJson.so.2.3.1
 lib/libSaxObjC.so
+lib/libSaxObjC.so.4.9.66
 lib/libWEExtensions.so
 lib/libWEExtensions.so.4.9.94
 lib/libWOExtensions.so
 lib/libWOExtensions.so.4.9.31
 lib/libXmlRpc.so
+lib/libXmlRpc.so.4.9.31
 share/GNUstep/Makefiles/Additional/ngobjweb.make
 share/GNUstep/Makefiles/woapp.make
 share/GNUstep/Makefiles/wobundle.make
diff --git a/devel/SOPE/distinfo b/devel/SOPE/distinfo
index bd7fbf73320..3497ec0753d 100644
--- a/devel/SOPE/distinfo
+++ b/devel/SOPE/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.7 2014/06/08 13:20:15 taca Exp $
+$NetBSD: distinfo,v 1.8 2015/03/01 13:19:20 taca Exp $
 
-SHA1 (SOPE-2.2.5.tar.gz) = 75c36c389bd2c470f164cd2b19752587df9090be
-RMD160 (SOPE-2.2.5.tar.gz) = b8f98b9e9b456c3e644052268ac15e821486c476
-Size (SOPE-2.2.5.tar.gz) = 2260654 bytes
+SHA1 (SOPE-2.2.16.tar.gz) = 713955945c78f22e08560aa0a5edd063d4461a80
+RMD160 (SOPE-2.2.16.tar.gz) = 39ffd28e4da78908bbbd2a26e12386fdc366fa1d
+Size (SOPE-2.2.16.tar.gz) = 2265943 bytes
 SHA1 (patch-sope-core_NGStreams_NGInternetSocketAddress.m) = e0262b32d6ac3766b06a797d19a976180078a780
 SHA1 (patch-sope-core_NGStreams_NGLocalSocketAddress.m) = 26288c147ef39ef3a63bc03cc83be123b364d206
 SHA1 (patch-sope-core_NGStreams_NGLocalSocketDomain.m) = 2b8d2e842e6de346bf908bf38bbf4c5de4d93e89