Add a missing file from neon sources to fix an "undefined symbols" error

on Darwin.  This addresses one of the errors reported in PR pkg/33233.
Patches obtained from GNOME CVS.

4 files changed, 148 insertions, 1 deletions

diff --git a/sysutils/gnome-vfs2/distinfo b/sysutils/gnome-vfs2/distinfo
index b6d46e5ab80..2d980b917ae 100644
--- a/sysutils/gnome-vfs2/distinfo
+++ b/sysutils/gnome-vfs2/distinfo
@@ -1,13 +1,15 @@
-$NetBSD: distinfo,v 1.54 2006/06/23 17:27:50 drochner Exp $
+$NetBSD: distinfo,v 1.55 2006/07/06 23:35:15 minskim Exp $
 
 SHA1 (gnome-vfs-2.14.2.tar.bz2) = ffd2e5f229495f55587d8499e5f2b8b8a76e5448
 RMD160 (gnome-vfs-2.14.2.tar.bz2) = e0a67e3576d72a86c898208a93ad8ee52f72f870
 Size (gnome-vfs-2.14.2.tar.bz2) = 1816194 bytes
 SHA1 (patch-aa) = a5a3ac6be3e2a888eaaab108807d2aff651e62db
 SHA1 (patch-ab) = 6320180870f234a150dfe40f8f990deec7a2a0b5
+SHA1 (patch-ac) = eb1e950deca2a83a47c6d422f6ca1059958430fa
 SHA1 (patch-ad) = 5df81a0bf979f710912b42883658c10d198cca87
 SHA1 (patch-ae) = b84609561dfedd1f1b55f93298f02ea841eec407
 SHA1 (patch-af) = 6724c4a43d0d9525f5361ba7380c91adbf656e56
+SHA1 (patch-ag) = 62c6b37f79abe8bb6b1e2e29e4071e32e4684900
 SHA1 (patch-ah) = 0927ade189c14472e5768b7e4775854de519f19c
 SHA1 (patch-ai) = 6afefb35bfe3fc37e84048b95ccc272a01542ec2
 SHA1 (patch-aj) = 0159ed71a69f4f15a4353d0bb9400e9341b59b9d
@@ -16,6 +18,7 @@ SHA1 (patch-ao) = 0cc64574f6d430ca385f22d28690b9cea9181390
 SHA1 (patch-ap) = 98ad7700d01007510467e2ae4ee8554f54f15320
 SHA1 (patch-aq) = 1d5ed4d6c1b3a282e68bedf6892fa8a9678ea39b
 SHA1 (patch-ar) = 33bac387ffe861141f9cd6564c24956d3e9e4cb4
+SHA1 (patch-as) = b57e7952a84e501d298a4d822049f9faa24122e3
 SHA1 (patch-au) = e3c681dd445d0774981a50eb22ae14ff4db5902c
 SHA1 (patch-aw) = 22801eb932f8f7e7256be3863fcd5273a7a5213e
 SHA1 (patch-ax) = 06a104c8ae3caf01a2bf6899cd2b85980c0bb26d
diff --git a/sysutils/gnome-vfs2/patches/patch-ac b/sysutils/gnome-vfs2/patches/patch-ac
new file mode 100644
index 00000000000..4fbecc4d7a3
--- /dev/null
+++ b/sysutils/gnome-vfs2/patches/patch-ac
@@ -0,0 +1,39 @@
+$NetBSD: patch-ac,v 1.11 2006/07/06 23:35:15 minskim Exp $
+
+--- imported/neon/Makefile.in.orig	2006-05-30 03:21:19.000000000 -0700
++++ imported/neon/Makefile.in
+@@ -56,7 +56,8 @@ am__objects_2 = $(am__objects_1)
+ am__objects_3 = ne_request.lo ne_session.lo ne_basic.lo ne_string.lo \
+ 	ne_uri.lo ne_dates.lo ne_alloc.lo ne_md5.lo ne_utils.lo \
+ 	ne_auth.lo ne_redirect.lo ne_compress.lo
+-am__objects_4 = ne_207.lo ne_xml.lo ne_props.lo ne_locks.lo
++am__objects_4 = ne_207.lo ne_xml.lo ne_props.lo ne_locks.lo \
++	ne_xmlreq.lo
+ am__objects_5 = ne_acl.lo ne_gnomevfs.lo
+ am_libneon_la_OBJECTS = $(am__objects_2) $(am__objects_3) \
+ 	$(am__objects_4) $(am__objects_5) $(am__objects_1)
+@@ -396,7 +397,7 @@ NEON_BASE_SOURCES = ne_request.c ne_sess
+ 
+ NEON_DAV_SOURCES = \
+ 	ne_207.c ne_xml.c \
+-	ne_props.c ne_locks.c
++	ne_props.c ne_locks.c ne_xmlreq.c
+ 
+ NEON_EXTRA_SOURCES = ne_acl.c ne_gnomevfs.c
+ libneon_la_LIBADD = \
+@@ -410,6 +411,7 @@ libneon_la_LDFLAGS = \
+ libneon_la_SOURCES = \
+ 	$(NEON_INCLUDES)	\
+ 	$(NEON_BASE_SOURCES) 	\
++	$(NEON_SSL_SOURCES)	\
+ 	$(NEON_DAV_SOURCES) 	\
+ 	$(NEON_EXTRA_SOURCES)	\
+         $(NULL)
+@@ -483,6 +485,7 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ne_uri.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ne_utils.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ne_xml.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ne_xmlreq.Plo@am__quote@
+ 
+ .c.o:
+ @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
diff --git a/sysutils/gnome-vfs2/patches/patch-ag b/sysutils/gnome-vfs2/patches/patch-ag
new file mode 100644
index 00000000000..4787217f075
--- /dev/null
+++ b/sysutils/gnome-vfs2/patches/patch-ag
@@ -0,0 +1,84 @@
+$NetBSD: patch-ag,v 1.10 2006/07/06 23:35:15 minskim Exp $
+
+--- imported/neon/ne_xmlreq.c.orig	2006-05-01 15:28:52.000000000 -0700
++++ imported/neon/ne_xmlreq.c
+@@ -0,0 +1,79 @@
++/* 
++   XML/HTTP response handling
++   Copyright (C) 2004-2005, Joe Orton <joe@manyfish.co.uk>
++
++   This library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Library General Public
++   License as published by the Free Software Foundation; either
++   version 2 of the License, or (at your option) any later version.
++   
++   This library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Library General Public License for more details.
++
++   You should have received a copy of the GNU Library General Public
++   License along with this library; if not, write to the Free
++   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
++   MA 02111-1307, USA
++
++*/
++
++#include "config.h"
++
++#include "ne_xmlreq.h"
++#include "ne_i18n.h"
++
++/* Handle an XML response parse error, setting session error string
++ * and closing the connection. */
++static int parse_error(ne_session *sess, ne_xml_parser *parser)
++{
++    ne_set_error(sess, _("Could not parse response: %s"),
++                 ne_xml_get_error(parser));
++    ne_close_connection(sess);
++    return NE_ERROR;
++}
++
++int ne_xml_parse_response(ne_request *req, ne_xml_parser *parser)
++{
++    char buf[8000];
++    ssize_t bytes;
++    int ret = 0;
++
++    while ((bytes = ne_read_response_block(req, buf, sizeof buf)) > 0) {
++        ret = ne_xml_parse(parser, buf, bytes);
++        if (ret)
++            return parse_error(ne_get_session(req), parser);
++    }
++
++    if (bytes == 0) {
++        /* Tell the parser that end of document was reached: */
++        if (ne_xml_parse(parser, NULL, 0) == 0)
++            return NE_OK;
++        else
++            return parse_error(ne_get_session(req), parser);
++    } else {
++        return NE_ERROR;
++    }    
++}
++
++int ne_xml_dispatch_request(ne_request *req, ne_xml_parser *parser)
++{
++    int ret;
++
++    do {
++        ret = ne_begin_request(req);
++        if (ret) break;
++
++        if (ne_get_status(req)->klass == 2)
++            ret = ne_xml_parse_response(req, parser);
++        else
++            ret = ne_discard_response(req);
++        
++        if (ret == NE_OK)
++            ret = ne_end_request(req);
++    } while (ret == NE_RETRY);
++
++    return ret;
++}
++
diff --git a/sysutils/gnome-vfs2/patches/patch-as b/sysutils/gnome-vfs2/patches/patch-as
new file mode 100644
index 00000000000..7442b046c83
--- /dev/null
+++ b/sysutils/gnome-vfs2/patches/patch-as
@@ -0,0 +1,21 @@
+$NetBSD: patch-as,v 1.3 2006/07/06 23:35:15 minskim Exp $
+
+--- imported/neon/Makefile.am.orig	2006-01-08 08:53:09.000000000 -0800
++++ imported/neon/Makefile.am
+@@ -58,7 +58,7 @@ NEON_BASE_SOURCES = ne_request.c ne_sess
+ 
+ NEON_DAV_SOURCES = \
+ 	ne_207.c ne_xml.c \
+-	ne_props.c ne_locks.c
++	ne_props.c ne_locks.c ne_xmlreq.c
+ 
+ NEON_EXTRA_SOURCES = ne_acl.c ne_gnomevfs.c
+ 
+@@ -73,6 +73,7 @@ libneon_la_LDFLAGS =			\
+ libneon_la_SOURCES = \
+ 	$(NEON_INCLUDES)	\
+ 	$(NEON_BASE_SOURCES) 	\
++	$(NEON_SSL_SOURCES)	\
+ 	$(NEON_DAV_SOURCES) 	\
+ 	$(NEON_EXTRA_SOURCES)	\
+         $(NULL)