diff --git a/net-misc/neon/neon-0.29.6.recipe b/net-libs/neon/neon-0.29.6.recipe
similarity index 100%
rename from net-misc/neon/neon-0.29.6.recipe
rename to net-libs/neon/neon-0.29.6.recipe
diff --git a/net-misc/neon/patches/neon-0.29.6.patch b/net-libs/neon/patches/neon-0.29.6.patch
similarity index 100%
rename from net-misc/neon/patches/neon-0.29.6.patch
rename to net-libs/neon/patches/neon-0.29.6.patch
diff --git a/net-misc/neon/neon-0.29.1.recipe b/net-misc/neon/neon-0.29.1.recipe
deleted file mode 100644
index 950c45d2c..000000000
--- a/net-misc/neon/neon-0.29.1.recipe
+++ /dev/null
@@ -1,23 +0,0 @@
-DESCRIPTION="neon is an HTTP and WebDAV client library, with a C interface" 
-HOMEPAGE="http://www.webdav.org/neon/" 
-SRC_URI="http://www.webdav.org/neon/neon-0.29.1.tar.gz"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="dev-libs/openssl >= 0.9.8l
-	dev-libs/libxml2 >= 2.7.3"
-CHECKSUM_MD5="eb4eac0499cb6fced6e3b11e4b720ebb"
-BUILD()
-{
-	cd neon-0.29.1
-	autogen.sh
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-ssl --with-libxml2 --enable-shared
-	make
-}
-
-INSTALL()
-{
-	cd neon-0.29.1
-	make install
-}
-LICENSE="GNU LGPL v2"
-COPYRIGHT="1999-2010 Joe Orton"
diff --git a/net-misc/neon/neon-0.29.3.recipe b/net-misc/neon/neon-0.29.3.recipe
deleted file mode 100644
index b3c3da7a5..000000000
--- a/net-misc/neon/neon-0.29.3.recipe
+++ /dev/null
@@ -1,23 +0,0 @@
-DESCRIPTION="neon is an HTTP and WebDAV client library, with a C interface" 
-HOMEPAGE="http://www.webdav.org/neon/" 
-SRC_URI="http://www.webdav.org/neon/neon-0.29.3.tar.gz"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="dev-libs/openssl >= 1.0.0
-	dev-libs/libxml2 >= 2.7.7"
-CHECKSUM_MD5="ba1015b59c112d44d7797b62fe7bee51"
-BUILD()
-{
-	cd neon-0.29.3
-	autogen.sh
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-ssl --with-libxml2 --enable-shared
-	make
-}
-
-INSTALL()
-{
-	cd neon-0.29.3
-	make install
-}
-LICENSE="GNU LGPL v2"
-COPYRIGHT="1999-2010 Joe Orton"
diff --git a/net-misc/neon/neon-0.29.4.recipe b/net-misc/neon/neon-0.29.4.recipe
deleted file mode 100644
index dd059582c..000000000
--- a/net-misc/neon/neon-0.29.4.recipe
+++ /dev/null
@@ -1,23 +0,0 @@
-DESCRIPTION="neon is an HTTP and WebDAV client library, with a C interface" 
-HOMEPAGE="http://www.webdav.org/neon/" 
-SRC_URI="http://www.webdav.org/neon/neon-0.29.4.tar.gz"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="dev-libs/openssl >= 1.0.0
-	dev-libs/libxml2 >= 2.7.7"
-CHECKSUM_MD5="29438dbdaee84db2d7fbc73248a92d93"
-BUILD()
-{
-	cd neon-0.29.4
-	autogen.sh
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-ssl --with-libxml2 --enable-shared
-	make
-}
-
-INSTALL()
-{
-	cd neon-0.29.4
-	make install
-}
-LICENSE="GNU LGPL v2"
-COPYRIGHT="1999-2010 Joe Orton"
diff --git a/net-misc/neon/neon-0.29.5.recipe b/net-misc/neon/neon-0.29.5.recipe
deleted file mode 100644
index 1cd36b5e1..000000000
--- a/net-misc/neon/neon-0.29.5.recipe
+++ /dev/null
@@ -1,38 +0,0 @@
-DESCRIPTION="neon is an HTTP and WebDAV client library, with a C interface" 
-HOMEPAGE="http://www.webdav.org/neon/" 
-SRC_URI="http://www.webdav.org/neon/neon-0.29.5.tar.gz"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="dev-libs/openssl >= 1.0.0
-	dev-libs/libxml2 >= 2.7.7"
-CHECKSUM_MD5="ff369e69ef0f0143beb5626164e87ae2"
-BUILD()
-{
-	cd neon-0.29.5
-	echo 'LT_INIT' >> configure.in.
-	echo 'AC_CONFIG_MACRO_DIR([macros])' >> configure.in
-	autogen.sh
-	libtoolize --force --copy --install
-	aclocal
-	autoconf
-	autogen.sh
-	libtoolize --force --copy --install
-	aclocal -I macros
-	autoconf
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-		--with-ssl \
-		--with-libxml2 \
-		--enable-shared \
-		--datarootdir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` \
-		--infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \
-		--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man 
-	make
-}
-
-INSTALL()
-{
-	cd neon-0.29.5
-	make install
-}
-LICENSE="GNU LGPL v2"
-COPYRIGHT="1999-2010 Joe Orton"
diff --git a/net-misc/neon/patches/neon-0.25.4.diff b/net-misc/neon/patches/neon-0.25.4.diff
deleted file mode 100644
index e5cc2ad31..000000000
--- a/net-misc/neon/patches/neon-0.25.4.diff
+++ /dev/null
@@ -1,73 +0,0 @@
-diff -ur neon-0.25.4-orig/src/ne_openssl.c neon-0.25.4/src/ne_openssl.c
---- neon-0.25.4-orig/src/ne_openssl.c	2005-06-01 09:19:15.000000000 +0000
-+++ neon-0.25.4/src/ne_openssl.c	2008-05-18 03:09:40.000000000 +0000
-@@ -196,8 +196,12 @@
-     
-     bio = BIO_new(BIO_s_mem());
-     if (bio) {
--	if (ASN1_TIME_print(bio, tm))
--	    BIO_read(bio, buf, NE_SSL_VDATELEN-1);
-+	if (ASN1_TIME_print(bio, tm)) {
-+	    int len = BIO_read(bio, buf, NE_SSL_VDATELEN-1);
-+	    if (len >= 0)
-+	    	buf[len] = '\0';
-+	    
-+	}
- 	BIO_free(bio);
-     }
- }
-diff -ur neon-0.25.4-orig/src/ne_socket.c neon-0.25.4/src/ne_socket.c
---- neon-0.25.4-orig/src/ne_socket.c	2005-08-19 09:40:16.000000000 +0000
-+++ neon-0.25.4/src/ne_socket.c	2008-05-18 03:09:40.000000000 +0000
-@@ -136,7 +136,7 @@
- #include "ne_alloc.h"
- #include "ne_sspi.h"
- 
--#if defined(__BEOS__) && !defined(BONE_VERSION)
-+#if defined(__BEOS__) && !defined(BONE_VERSION) && !defined(__HAIKU__)
- /* pre-BONE */
- #define ne_close(s) closesocket(s)
- #define ne_errno errno
-diff -ur neon-0.25.4-orig/test/common/child.c neon-0.25.4/test/common/child.c
---- neon-0.25.4-orig/test/common/child.c	2005-02-14 15:43:27.000000000 +0000
-+++ neon-0.25.4/test/common/child.c	2008-05-18 03:09:40.000000000 +0000
-@@ -230,11 +230,12 @@
- 	char ch;
- 	
- #ifdef USE_PIPE
-+	close(fds[1]);
-+
- 	if (read(fds[0], &ch, 1) < 0)
- 	    perror("parent read");
- 
- 	close(fds[0]);
--	close(fds[1]);
- #else
- 	minisleep();
- #endif
-diff -ur neon-0.25.4-orig/test/common/tests.c neon-0.25.4/test/common/tests.c
---- neon-0.25.4-orig/test/common/tests.c	2005-02-14 15:43:27.000000000 +0000
-+++ neon-0.25.4/test/common/tests.c	2008-05-18 03:09:40.000000000 +0000
-@@ -22,7 +22,7 @@
- 
- #include <sys/types.h>
- 
--#include <sys/signal.h>
-+//#include <sys/signal.h>
- 
- #include <stdio.h>
- #ifdef HAVE_SIGNAL_H
-diff -ur neon-0.25.4-orig/test/run.sh neon-0.25.4/test/run.sh
---- neon-0.25.4-orig/test/run.sh	2004-10-17 18:18:20.000000000 +0000
-+++ neon-0.25.4/test/run.sh	2008-05-18 03:09:40.000000000 +0000
-@@ -2,8 +2,8 @@
- 
- rm -f debug.log child.log
- 
--ulimit -c unlimited
--ulimit -v 10240
-+#ulimit -c unlimited
-+#ulimit -v 10240
- 
- # enable an safety-checking malloc in glibc which will abort() if
- # heap corruption is detected.
diff --git a/net-misc/neon/patches/neon-0.28.3-haiku.diff b/net-misc/neon/patches/neon-0.28.3-haiku.diff
deleted file mode 100644
index 564e93671..000000000
--- a/net-misc/neon/patches/neon-0.28.3-haiku.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -urN neon-0.28.3/macros/neon.m4 neon-0.28.3-haiku/macros/neon.m4
---- neon-0.28.3/macros/neon.m4	2008-12-08 08:30:42.000000000 -0800
-+++ neon-0.28.3-haiku/macros/neon.m4	2008-12-08 08:12:43.000000000 -0800
-@@ -626,7 +626,7 @@
- 
- # Unixware 7 can only link gethostbyname with -lnsl -lsocket
- # Pick up -lsocket first, then the gethostbyname check will work.
--NE_SEARCH_LIBS(socket, socket inet ws2_32)
-+NE_SEARCH_LIBS(socket, socket inet ws2_32 network)
- 
- # Enable getaddrinfo support if it, gai_strerror and inet_ntop are
- # all available.
-@@ -659,7 +659,7 @@
-    # Checks for non-getaddrinfo() based resolver interfaces.
-    # QNX has gethostbyname in -lsocket. BeOS only has it in -lbind.
-    # CygWin/Winsock2 has it in -lws2_32, allegedly.
--   NE_SEARCH_LIBS(gethostbyname, socket nsl bind ws2_32)
-+   NE_SEARCH_LIBS(gethostbyname, socket nsl bind ws2_32 network)
-    NE_SEARCH_LIBS(hstrerror, resolv,,[:])
-    NE_CHECK_FUNCS(hstrerror)
-    # Older Unixes don't declare h_errno.