6 files changed, 46 insertions, 71 deletions

diff --git a/www/neon29/Makefile b/www/neon29/Makefile
index 06c2fad76e39..96ec8999815b 100644
--- a/www/neon29/Makefile
+++ b/www/neon29/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	neon
-PORTVERSION=	0.23.9
+PORTVERSION=	0.24.2
 CATEGORIES=	www
 MASTER_SITES=	http://www.webdav.org/neon/
 
@@ -25,29 +25,35 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-ssl \
 		--enable-xml \
 		--enable-shared \
-		--with-expat=${PREFIX}
+		--with-expat \
+		--with-libs=${PREFIX}
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 MAN1=	neon-config.1
 MAN3=	ne_add_request_header.3 ne_addr_destroy.3 ne_addr_error.3 \
-	ne_addr_first.3 ne_addr_next.3 ne_addr_print.3 ne_addr_resolve.3 \
-	ne_addr_result.3 ne_buffer.3 ne_buffer_altered.3 \
-	ne_buffer_append.3 ne_buffer_clear.3 ne_buffer_concat.3 \
-	ne_buffer_create.3 ne_buffer_destroy.3 ne_buffer_finish.3 \
-	ne_buffer_grow.3 ne_buffer_ncreate.3 ne_buffer_zappend.3 \
-	ne_calloc.3 ne_close_connection.3 ne_forget_auth.3 \
-	ne_get_error.3 ne_get_status.3 ne_malloc.3 ne_oom_callback.3 \
-	ne_print_request_header.3 ne_qtoken.3 ne_realloc.3 \
+	ne_addr_first.3 ne_addr_next.3 ne_addr_resolve.3 ne_addr_result.3 \
+	ne_buffer.3 ne_buffer_altered.3 ne_buffer_append.3 ne_buffer_clear.3 \
+	ne_buffer_concat.3 ne_buffer_create.3 ne_buffer_destroy.3 \
+	ne_buffer_finish.3 ne_buffer_grow.3 ne_buffer_ncreate.3 \
+	ne_buffer_zappend.3 ne_calloc.3 ne_close_connection.3 \
+	ne_forget_auth.3 ne_get_error.3 ne_get_status.3 ne_iaddr_cmp.3 \
+	ne_iaddr_free.3 ne_iaddr_make.3 ne_iaddr_print.3 ne_malloc.3 \
+	ne_oom_callback.3 ne_print_request_header.3 ne_qtoken.3 ne_realloc.3 \
 	ne_request_create.3 ne_request_destroy.3 ne_request_dispatch.3 \
 	ne_session_create.3 ne_session_destroy.3 ne_session_proxy.3 \
 	ne_set_error.3 ne_set_expect100.3 ne_set_persist.3 \
 	ne_set_proxy_auth.3 ne_set_read_timeout.3 \
 	ne_set_request_body_buffer.3 ne_set_request_body_fd.3 \
 	ne_set_server_auth.3 ne_set_useragent.3 ne_shave.3 ne_sock_init.3 \
-	ne_ssl_certificate.3 ne_ssl_dname.3 ne_ssl_load_ca.3 \
-	ne_ssl_load_default_ca.3 ne_ssl_readable_dname.3 \
-	ne_ssl_set_verify.3 ne_status.3 ne_strdup.3 ne_strndup.3 \
-	ne_token.3 ne_version_match.3 ne_version_string.3 neon.3
+	ne_ssl_cert_cmp.3 ne_ssl_cert_export.3 ne_ssl_cert_free.3 \
+	ne_ssl_cert_identity.3 ne_ssl_cert_import.3 ne_ssl_cert_issuer.3 \
+	ne_ssl_cert_read.3 ne_ssl_cert_signedby.3 ne_ssl_cert_subject.3 \
+	ne_ssl_cert_write.3 ne_ssl_clicert_decrypt.3 \
+	ne_ssl_clicert_encrypted.3 ne_ssl_clicert_free.3 \
+	ne_ssl_clicert_name.3 ne_ssl_clicert_owner.3 ne_ssl_clicert_read.3 \
+	ne_ssl_dname_cmp.3 ne_ssl_readable_dname.3 ne_ssl_set_verify.3 \
+	ne_ssl_trust_cert.3 ne_ssl_trust_default_ca.3 ne_status.3 ne_strdup.3 \
+	ne_strndup.3 ne_token.3 ne_version_match.3 ne_version_string.3 neon.3
 
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
diff --git a/www/neon29/distinfo b/www/neon29/distinfo
index fa9506d924e0..f9ff153032c0 100644
--- a/www/neon29/distinfo
+++ b/www/neon29/distinfo
@@ -1 +1 @@
-MD5 (neon-0.23.9.tar.gz) = b63b0430df64bb3c60b7fd0fc37d9004
+MD5 (neon-0.24.2.tar.gz) = 170ee966d3217031347d878f614033cd
diff --git a/www/neon29/files/patch-Makefile.in b/www/neon29/files/patch-Makefile.in
index d2b965fc7f06..b161622c85ae 100644
--- a/www/neon29/files/patch-Makefile.in
+++ b/www/neon29/files/patch-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Sat Jun 22 17:56:55 2002
-+++ Makefile.in	Thu Jan  2 16:41:37 2003
+--- Makefile.in.orig	Thu Sep 25 09:54:22 2003
++++ Makefile.in	Thu Sep 25 09:58:23 2003
 @@ -21,7 +21,7 @@
  man1dir = $(mandir)/man1
  man3dir = $(mandir)/man3
@@ -8,13 +8,13 @@
 +docdir = $(datadir)/doc/neon
  includedir = @includedir@
  neonincludes = $(includedir)/neon
+ pkgconfigdir = $(libdir)/pkgconfig
+@@ -132,7 +132,7 @@
+ 	@echo "ERROR: purposes only; this copy of neon must not be installed."
+ 	@false
  
-@@ -115,7 +115,7 @@
- 	for m in $(srcdir)/doc/man/*.1; do \
- 	 $(INSTALL_DATA) $$m $(DESTDIR)$(man1dir); done
- 
--install: subdirs install-headers install-lib install-config install-docs
-+install: subdirs install-headers install-lib install-config
+-install-yes: install-lib install-headers install-config install-docs
++install-yes: install-lib install-headers install-config
  
  # libtool does all the necessary magic here
- install-lib: src/libneon.la
+ install-lib: subdirs
diff --git a/www/neon29/files/patch-configure b/www/neon29/files/patch-configure
deleted file mode 100644
index 9dd4c2140d50..000000000000
--- a/www/neon29/files/patch-configure
+++ /dev/null
@@ -1,23 +0,0 @@
---- configure.orig	Fri Apr 26 17:15:20 2002
-+++ configure	Fri Apr 26 17:15:51 2002
-@@ -10792,7 +10792,7 @@
- _ACEOF
- 
- fi
--if test -r "$neon_expat_dir/expat.h"; then
-+if test -r "$neon_expat_dir/include/expat.h"; then
-        ne_found_hdr=yes
- 
- cat >>confdefs.h <<\_ACEOF
-@@ -10806,9 +10806,9 @@
- #define HAVE_EXPAT 1
- _ACEOF
- 
--	CFLAGS="$CFLAGS -I$neon_expat_dir"
-+	CFLAGS="$CFLAGS -I$neon_expat_dir/include"
- 		if test -z "$neon_using_libtool_expat"; then
--		NEON_LIBS="$NEON_LIBS -L$neon_expat_dir -lexpat"
-+		NEON_LIBS="$NEON_LIBS -L$neon_expat_dir/lib -lexpat"
- 	fi
- 	neon_xml_parser_message="expat in $neon_expat_dir"
- 	neon_found_parser="yes"
diff --git a/www/neon29/files/patch-ltmain.sh b/www/neon29/files/patch-ltmain.sh
index 348425fb00d2..003c40b7a007 100644
--- a/www/neon29/files/patch-ltmain.sh
+++ b/www/neon29/files/patch-ltmain.sh
@@ -17,16 +17,6 @@
  	continue
  	;;
  
-@@ -2412,6 +2420,9 @@
- 	  *-*-netbsd*)
- 	    # Don't link with libc until the a.out ld.so is fixed.
- 	    ;;
-+	  *-*-freebsd*)
-+	    # FreeBSD doesn't need this...
-+	    ;;
- 	  *)
- 	    # Add libc to deplibs on all other systems if necessary.
- 	    if test "$build_libtool_need_lc" = "yes"; then
 @@ -4179,10 +4190,12 @@
  	fi
  
diff --git a/www/neon29/pkg-plist b/www/neon29/pkg-plist
index e82a8af6915b..cd2645af517f 100644
--- a/www/neon29/pkg-plist
+++ b/www/neon29/pkg-plist
@@ -16,14 +16,16 @@ include/neon/ne_redirect.h
 include/neon/ne_request.h
 include/neon/ne_session.h
 include/neon/ne_socket.h
+include/neon/ne_ssl.h
 include/neon/ne_string.h
 include/neon/ne_uri.h
 include/neon/ne_utils.h
 include/neon/ne_xml.h
-@dirrm include/neon
-lib/libneon.so.23
+lib/libneon.so.24
 lib/libneon.so
 lib/libneon.a
+lib/pkgconfig/neon.pc
+%%PORTDOCS%%%%DOCSDIR%%/html/apas01.html
 %%PORTDOCS%%%%DOCSDIR%%/html/apas02.html
 %%PORTDOCS%%%%DOCSDIR%%/html/apas03.html
 %%PORTDOCS%%%%DOCSDIR%%/html/apas04.html
@@ -35,18 +37,13 @@ lib/libneon.a
 %%PORTDOCS%%%%DOCSDIR%%/html/apas10.html
 %%PORTDOCS%%%%DOCSDIR%%/html/apas11.html
 %%PORTDOCS%%%%DOCSDIR%%/html/apas12.html
-%%PORTDOCS%%%%DOCSDIR%%/html/auth.html
-%%PORTDOCS%%%%DOCSDIR%%/html/basic.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ch01s02.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ch01s03.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ch02.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api.html
+%%PORTDOCS%%%%DOCSDIR%%/html/biblio.html
 %%PORTDOCS%%%%DOCSDIR%%/html/compliance.html
+%%PORTDOCS%%%%DOCSDIR%%/html/features.html
 %%PORTDOCS%%%%DOCSDIR%%/html/gfdl.html
 %%PORTDOCS%%%%DOCSDIR%%/html/index.html
 %%PORTDOCS%%%%DOCSDIR%%/html/intro.html
-%%PORTDOCS%%%%DOCSDIR%%/html/locking.html
-%%PORTDOCS%%%%DOCSDIR%%/html/lowlevel.html
-%%PORTDOCS%%%%DOCSDIR%%/html/props.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ref.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refalloc.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refauth.html
@@ -55,9 +52,12 @@ lib/libneon.a
 %%PORTDOCS%%%%DOCSDIR%%/html/refbufcr.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refbufdest.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refbufutil.html
+%%PORTDOCS%%%%DOCSDIR%%/html/refcert.html
+%%PORTDOCS%%%%DOCSDIR%%/html/refclicert.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refconfig.html
 %%PORTDOCS%%%%DOCSDIR%%/html/referr.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refgetst.html
+%%PORTDOCS%%%%DOCSDIR%%/html/refiaddr.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refneon.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refopts.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refreq.html
@@ -68,15 +68,17 @@ lib/libneon.a
 %%PORTDOCS%%%%DOCSDIR%%/html/refshave.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refsockinit.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refsslca.html
-%%PORTDOCS%%%%DOCSDIR%%/html/reftok.html
-%%PORTDOCS%%%%DOCSDIR%%/html/refsslcert.html
+%%PORTDOCS%%%%DOCSDIR%%/html/refsslcert2.html
+%%PORTDOCS%%%%DOCSDIR%%/html/refsslcertio.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refssldname.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refsslvfy.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refstatus.html
+%%PORTDOCS%%%%DOCSDIR%%/html/reftok.html
 %%PORTDOCS%%%%DOCSDIR%%/html/refvers.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ssl.html
-%%PORTDOCS%%%%DOCSDIR%%/html/utils.html
+%%PORTDOCS%%%%DOCSDIR%%/html/using.html
 %%PORTDOCS%%%%DOCSDIR%%/html/xml.html
 %%PORTDOCS%%%%DOCSDIR%%/using-neon.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@unexec rmdir %D/lib/pkgconfig > /dev/null 2>&1 || true
+@dirrm include/neon