28 files changed, 22 insertions, 282 deletions

diff --git a/MOVED b/MOVED
index 65fcf9557a01..d7a6485d6b31 100644
--- a/MOVED
+++ b/MOVED
@@ -3469,3 +3469,4 @@ x11-wm/yawm||2008-04-30|Has expired: project no longer exists
 x11-wm/uwm||2008-04-30|Has expired: Version branch long since retired
 arabic/katoob||2008-04-30|Removed on maintainers request due to inactivity of project
 security/drupal4-ldap_integration||2008-04-30|Removed due to being broken and clearly not used
+www/neon|www/neon2|2008-05-05|Moved to be able to integrate www/neon26
diff --git a/audio/libmusicbrainz3/Makefile b/audio/libmusicbrainz3/Makefile
index f9031ce7943b..8730d04a6df5 100644
--- a/audio/libmusicbrainz3/Makefile
+++ b/audio/libmusicbrainz3/Makefile
@@ -18,7 +18,7 @@ COMMENT=	MusicBrainz client library for audio metadata lookup
 
 BUILD_DEPENDS=	cmake:${PORTSDIR}/devel/cmake
 LIB_DEPENDS=	discid:${PORTSDIR}/audio/libdiscid \
-		neon.26:${PORTSDIR}/www/neon
+		neon.26:${PORTSDIR}/www/neon26
 
 CMAKE_ARGS=	-DCMAKE_BUILD_TYPE:STRING=Release \
 		-DCMAKE_C_COMPILER:STRING='${CC}' \
diff --git a/audio/libmusicbrainz4/Makefile b/audio/libmusicbrainz4/Makefile
index f9031ce7943b..8730d04a6df5 100644
--- a/audio/libmusicbrainz4/Makefile
+++ b/audio/libmusicbrainz4/Makefile
@@ -18,7 +18,7 @@ COMMENT=	MusicBrainz client library for audio metadata lookup
 
 BUILD_DEPENDS=	cmake:${PORTSDIR}/devel/cmake
 LIB_DEPENDS=	discid:${PORTSDIR}/audio/libdiscid \
-		neon.26:${PORTSDIR}/www/neon
+		neon.26:${PORTSDIR}/www/neon26
 
 CMAKE_ARGS=	-DCMAKE_BUILD_TYPE:STRING=Release \
 		-DCMAKE_C_COMPILER:STRING='${CC}' \
diff --git a/audio/libmusicbrainz5/Makefile b/audio/libmusicbrainz5/Makefile
index f9031ce7943b..8730d04a6df5 100644
--- a/audio/libmusicbrainz5/Makefile
+++ b/audio/libmusicbrainz5/Makefile
@@ -18,7 +18,7 @@ COMMENT=	MusicBrainz client library for audio metadata lookup
 
 BUILD_DEPENDS=	cmake:${PORTSDIR}/devel/cmake
 LIB_DEPENDS=	discid:${PORTSDIR}/audio/libdiscid \
-		neon.26:${PORTSDIR}/www/neon
+		neon.26:${PORTSDIR}/www/neon26
 
 CMAKE_ARGS=	-DCMAKE_BUILD_TYPE:STRING=Release \
 		-DCMAKE_C_COMPILER:STRING='${CC}' \
diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile
index 6681454c3ec3..f0ea2007ba1d 100644
--- a/devel/anjuta/Makefile
+++ b/devel/anjuta/Makefile
@@ -21,7 +21,7 @@ BUILD_DEPENDS=	autogen:${PORTSDIR}/devel/autogen \
 LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre \
 		gbf-1.1:${PORTSDIR}/devel/gnome-build \
 		gladeui-1.7:${PORTSDIR}/devel/glade3 \
-		neon.26:${PORTSDIR}/www/neon \
+		neon.26:${PORTSDIR}/www/neon26 \
 		devhelp-1.0:${PORTSDIR}/devel/devhelp
 RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
 		autogen:${PORTSDIR}/devel/autogen \
diff --git a/devel/baz/Makefile b/devel/baz/Makefile
index ae82d23dffd6..6a0e640c4d10 100644
--- a/devel/baz/Makefile
+++ b/devel/baz/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS=	gpatch:${PORTSDIR}/devel/patch \
 		gdiff:${PORTSDIR}/textproc/diffutils \
 		gtar:${PORTSDIR}/archivers/gtar
 RUN_DEPENDS=	${BUILD_DEPENDS}
-LIB_DEPENDS=	neon.26:${PORTSDIR}/www/neon \
+LIB_DEPENDS=	neon.26:${PORTSDIR}/www/neon26 \
 		gpgme.17:${PORTSDIR}/security/gpgme
 
 USE_GMAKE=	yes
diff --git a/devel/bazaar/Makefile b/devel/bazaar/Makefile
index ae82d23dffd6..6a0e640c4d10 100644
--- a/devel/bazaar/Makefile
+++ b/devel/bazaar/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS=	gpatch:${PORTSDIR}/devel/patch \
 		gdiff:${PORTSDIR}/textproc/diffutils \
 		gtar:${PORTSDIR}/archivers/gtar
 RUN_DEPENDS=	${BUILD_DEPENDS}
-LIB_DEPENDS=	neon.26:${PORTSDIR}/www/neon \
+LIB_DEPENDS=	neon.26:${PORTSDIR}/www/neon26 \
 		gpgme.17:${PORTSDIR}/security/gpgme
 
 USE_GMAKE=	yes
diff --git a/devel/kdesvn-kde4/Makefile b/devel/kdesvn-kde4/Makefile
index 3c11805774b9..2fac46bec9d4 100644
--- a/devel/kdesvn-kde4/Makefile
+++ b/devel/kdesvn-kde4/Makefile
@@ -25,7 +25,7 @@ CMAKE_ARGS=	-DCMAKE_BUILD_TYPE:STRING=Release \
 
 LIB_DEPENDS+=	apr-1:${PORTSDIR}/devel/apr-svn \
 		svn_client-1:${PORTSDIR}/devel/subversion \
-		neon:${PORTSDIR}/www/neon
+		neon:${PORTSDIR}/www/neon26
 
 USE_BZIP2=	yes
 USE_KDELIBS_VER=3
diff --git a/devel/kdesvn/Makefile b/devel/kdesvn/Makefile
index 3c11805774b9..2fac46bec9d4 100644
--- a/devel/kdesvn/Makefile
+++ b/devel/kdesvn/Makefile
@@ -25,7 +25,7 @@ CMAKE_ARGS=	-DCMAKE_BUILD_TYPE:STRING=Release \
 
 LIB_DEPENDS+=	apr-1:${PORTSDIR}/devel/apr-svn \
 		svn_client-1:${PORTSDIR}/devel/subversion \
-		neon:${PORTSDIR}/www/neon
+		neon:${PORTSDIR}/www/neon26
 
 USE_BZIP2=	yes
 USE_KDELIBS_VER=3
diff --git a/devel/pysvn/Makefile b/devel/pysvn/Makefile
index 4bff6ed152d2..2cdd83d1b2c9 100644
--- a/devel/pysvn/Makefile
+++ b/devel/pysvn/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Python binding for Subversion
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/CXX/__init__.py:${PORTSDIR}/devel/py-cxx
 LIB_DEPENDS=	svn_client-1:${PORTSDIR}/devel/subversion \
 		apr-1.2:${PORTSDIR}/devel/apr \
-		neon.26:${PORTSDIR}/www/neon
+		neon.26:${PORTSDIR}/www/neon26
 
 USE_PYTHON=	2.3+
 USE_PYDISTUTILS=yes
diff --git a/devel/rapidsvn/Makefile b/devel/rapidsvn/Makefile
index 5a55523f917b..16ca67268c6a 100644
--- a/devel/rapidsvn/Makefile
+++ b/devel/rapidsvn/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Cross-platform GUI front-end for the Subversion revision system
 
 BUILD_DEPENDS=	apr-1-config:${PORTSDIR}/devel/apr-svn \
-		neon-config:${PORTSDIR}/www/neon \
+		neon-config:${PORTSDIR}/www/neon26 \
 		svn:${PORTSDIR}/devel/subversion \
 		xsltproc:${PORTSDIR}/textproc/libxslt \
 		${LOCALBASE}/share/xsl/docbook/VERSION:${PORTSDIR}/textproc/docbook-xsl
diff --git a/devel/subcommander/Makefile b/devel/subcommander/Makefile
index 891e63692428..7a07b1e7d834 100644
--- a/devel/subcommander/Makefile
+++ b/devel/subcommander/Makefile
@@ -14,7 +14,7 @@ DISTNAME=	Subcommander-${PORTVERSION}
 MAINTAINER=	zhoushuqun@gmail.com
 COMMENT=	Qt based multiplatform subversion client, diff & merge tool
 
-LIB_DEPENDS=	neon.26:${PORTSDIR}/www/neon \
+LIB_DEPENDS=	neon.26:${PORTSDIR}/www/neon26 \
 		apr-1.2:${PORTSDIR}/devel/apr-svn \
 		boost_thread.4:${PORTSDIR}/devel/boost \
 		svn_client-1.0:${PORTSDIR}/devel/subversion
diff --git a/devel/subcommander2/Makefile b/devel/subcommander2/Makefile
index 891e63692428..7a07b1e7d834 100644
--- a/devel/subcommander2/Makefile
+++ b/devel/subcommander2/Makefile
@@ -14,7 +14,7 @@ DISTNAME=	Subcommander-${PORTVERSION}
 MAINTAINER=	zhoushuqun@gmail.com
 COMMENT=	Qt based multiplatform subversion client, diff & merge tool
 
-LIB_DEPENDS=	neon.26:${PORTSDIR}/www/neon \
+LIB_DEPENDS=	neon.26:${PORTSDIR}/www/neon26 \
 		apr-1.2:${PORTSDIR}/devel/apr-svn \
 		boost_thread.4:${PORTSDIR}/devel/boost \
 		svn_client-1.0:${PORTSDIR}/devel/subversion
diff --git a/devel/subversion-devel/Makefile b/devel/subversion-devel/Makefile
index 9cbb65ac95ca..17f2ad6e6e01 100644
--- a/devel/subversion-devel/Makefile
+++ b/devel/subversion-devel/Makefile
@@ -82,7 +82,7 @@ CFLAGS+=	-g
 .endif
 
 .if !defined(WITHOUT_NEON)
-LIB_DEPENDS+=	neon.26:${PORTSDIR}/www/neon
+LIB_DEPENDS+=	neon.26:${PORTSDIR}/www/neon26
 CONFIGURE_ARGS+=	--with-neon=${LOCALBASE}
 PLIST_SUB+=		WITHOUT_NEON=""
 .else
diff --git a/devel/subversion-freebsd/Makefile b/devel/subversion-freebsd/Makefile
index 9cbb65ac95ca..17f2ad6e6e01 100644
--- a/devel/subversion-freebsd/Makefile
+++ b/devel/subversion-freebsd/Makefile
@@ -82,7 +82,7 @@ CFLAGS+=	-g
 .endif
 
 .if !defined(WITHOUT_NEON)
-LIB_DEPENDS+=	neon.26:${PORTSDIR}/www/neon
+LIB_DEPENDS+=	neon.26:${PORTSDIR}/www/neon26
 CONFIGURE_ARGS+=	--with-neon=${LOCALBASE}
 PLIST_SUB+=		WITHOUT_NEON=""
 .else
diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile
index 9cbb65ac95ca..17f2ad6e6e01 100644
--- a/devel/subversion/Makefile
+++ b/devel/subversion/Makefile
@@ -82,7 +82,7 @@ CFLAGS+=	-g
 .endif
 
 .if !defined(WITHOUT_NEON)
-LIB_DEPENDS+=	neon.26:${PORTSDIR}/www/neon
+LIB_DEPENDS+=	neon.26:${PORTSDIR}/www/neon26
 CONFIGURE_ARGS+=	--with-neon=${LOCALBASE}
 PLIST_SUB+=		WITHOUT_NEON=""
 .else
diff --git a/devel/subversion16/Makefile b/devel/subversion16/Makefile
index 9cbb65ac95ca..17f2ad6e6e01 100644
--- a/devel/subversion16/Makefile
+++ b/devel/subversion16/Makefile
@@ -82,7 +82,7 @@ CFLAGS+=	-g
 .endif
 
 .if !defined(WITHOUT_NEON)
-LIB_DEPENDS+=	neon.26:${PORTSDIR}/www/neon
+LIB_DEPENDS+=	neon.26:${PORTSDIR}/www/neon26
 CONFIGURE_ARGS+=	--with-neon=${LOCALBASE}
 PLIST_SUB+=		WITHOUT_NEON=""
 .else
diff --git a/multimedia/audacious-plugins/Makefile b/multimedia/audacious-plugins/Makefile
index 9c7c5dd65215..17f7695dac10 100644
--- a/multimedia/audacious-plugins/Makefile
+++ b/multimedia/audacious-plugins/Makefile
@@ -310,7 +310,7 @@ PLIST_SUB+=	PARANORMALPLUGIN="@comment "
 .endif
 
 .if !defined(WITHOUT_NEON)
-LIB_DEPENDS+=	neon.26:${PORTSDIR}/www/neon
+LIB_DEPENDS+=	neon.26:${PORTSDIR}/www/neon26
 CONFIGURE_ARGS+=--enable-neon
 PLIST_SUB+=	NEONPLUGIN=""
 .else
diff --git a/sysutils/fusefs-wdfs/Makefile b/sysutils/fusefs-wdfs/Makefile
index 6da89928555d..7460577c9378 100644
--- a/sysutils/fusefs-wdfs/Makefile
+++ b/sysutils/fusefs-wdfs/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	tgyurci@freemail.hu
 COMMENT=	Mount remote WedDAV directories with Fuse
 
 LIB_DEPENDS=	fuse.2:${PORTSDIR}/sysutils/fusefs-libs \
-		neon.26:${PORTSDIR}/www/neon
+		neon.26:${PORTSDIR}/www/neon26
 RUN_DEPENDS=	${LOCALBASE}/modules/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod
 
 GNU_CONFIGURE=	yes
diff --git a/www/cadaver/Makefile b/www/cadaver/Makefile
index 4d9d70f4f636..85da9c15aaf7 100644
--- a/www/cadaver/Makefile
+++ b/www/cadaver/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES=	http://www.webdav.org/cadaver/ \
 MAINTAINER=	josh@tcbug.org
 COMMENT=	Commandline client for DAV
 
-LIB_DEPENDS=	neon.26:${PORTSDIR}/www/neon
+LIB_DEPENDS=	neon.26:${PORTSDIR}/www/neon26
 
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/www/neon/Makefile b/www/neon/Makefile
deleted file mode 100644
index b09d10c555f2..000000000000
--- a/www/neon/Makefile
+++ /dev/null
@@ -1,120 +0,0 @@
-# New ports collection makefile for: neon
-# Date created:		13 October 2000
-# Whom:			Mikhail Teterin <mi@aldan.algebra.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	neon
-PORTVERSION=	0.26.4
-PORTREVISION=	0
-CATEGORIES=	www
-MASTER_SITES=	http://www.webdav.org/neon/ \
-		http://keyserver.kjsl.com/~jharris/distfiles/
-
-MAINTAINER=	lev@FreeBSD.org
-COMMENT=	An HTTP and WebDAV client library for Unix systems
-
-LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
-
-USE_AUTOTOOLS=	libtool:15
-USE_LDCONFIG=	yes
-
-.if defined(WITHOUT_NLS)
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.else
-USE_GETTEXT=	yes
-PLIST_SUB+=	NLS=""
-.endif
-
-.ifndef WITHOUT_OPENSSL
-USE_OPENSSL=	yes
-.endif
-
-USE_GNOME=	gnomehack gnometarget
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-ssl \
-		--enable-xml \
-		--enable-shared \
-		--with-expat \
-		--with-libs=${PREFIX}
-
-MAN1=	neon-config.1
-MAN3=	ne_add_request_header.3 ne_addr_resolve.3 ne_buffer.3 \
-	ne_buffer_append.3 ne_buffer_clear.3 ne_buffer_create.3 \
-	ne_buffer_destroy.3 ne_get_error.3 ne_get_response_header.3 \
-	ne_get_status.3 ne_i18n_init.3 ne_iaddr_make.3 ne_has_support.3 \
-	ne_malloc.3 ne_request_create.3 ne_session_create.3 \
-	ne_set_request_body_buffer.3 ne_set_request_expect100.3 \
-	ne_set_server_auth.3 ne_set_useragent.3 ne_shave.3 ne_sock_init.3 \
-	ne_ssl_cert_cmp.3 ne_ssl_cert_identity.3 ne_ssl_cert_read.3 \
-	ne_ssl_clicert_read.3 ne_ssl_readable_dname.3 ne_ssl_set_verify.3 \
-	ne_ssl_trust_cert.3 ne_status.3 ne_token.3 ne_version_match.3 \
-	ne_xml_create.3 neon.3
-MLINKS=	ne_add_request_header.3 ne_print_request_header.3 \
-	ne_addr_resolve.3 ne_addr_destroy.3 \
-	ne_addr_resolve.3 ne_addr_error.3 \
-	ne_addr_resolve.3 ne_addr_first.3 \
-	ne_addr_resolve.3 ne_addr_next.3 \
-	ne_addr_resolve.3 ne_addr_result.3 \
-	ne_buffer_append.3 ne_buffer_concat.3 \
-	ne_buffer_append.3 ne_buffer_zappend.3 \
-	ne_buffer_clear.3 ne_buffer_altered.3 \
-	ne_buffer_clear.3 ne_buffer_grow.3 \
-	ne_buffer_create.3 ne_buffer_ncreate.3 \
-	ne_buffer_destroy.3 ne_buffer_finish.3 \
-	ne_get_error.3 ne_set_error.3 \
-	ne_get_response_header.3 ne_response_header_iterate.3 \
-	ne_iaddr_make.3 ne_iaddr_cmp.3 \
-	ne_iaddr_make.3 ne_iaddr_free.3 \
-	ne_iaddr_make.3 ne_iaddr_print.3 \
-	ne_iaddr_make.3 ne_iaddr_typeof.3 \
-	ne_malloc.3 ne_calloc.3 \
-	ne_malloc.3 ne_oom_callback.3 \
-	ne_malloc.3 ne_realloc.3 \
-	ne_malloc.3 ne_strdup.3 \
-	ne_malloc.3 ne_strndup.3 \
-	ne_request_create.3 ne_request_destroy.3 \
-	ne_request_create.3 ne_request_dispatch.3 \
-	ne_session_create.3 ne_close_connection.3 \
-	ne_session_create.3 ne_session_destroy.3 \
-	ne_session_create.3 ne_session_proxy.3 \
-	ne_set_request_body_buffer.3 ne_set_request_body_fd.3 \
-	ne_set_request_body_buffer.3 ne_set_request_body_fd64.3 \
-	ne_set_server_auth.3 ne_forget_auth.3 \
-	ne_set_server_auth.3 ne_set_proxy_auth.3 \
-	ne_set_useragent.3 ne_get_scheme.3 \
-	ne_set_useragent.3 ne_get_server_hostport.3 \
-	ne_set_useragent.3 ne_set_persist.3 \
-	ne_set_useragent.3 ne_set_read_timeout.3 \
-	ne_sock_init.3 ne_sock_exit.3 \
-	ne_ssl_cert_cmp.3 ne_ssl_cert_free.3 \
-	ne_ssl_cert_identity.3 ne_ssl_cert_issuer.3 \
-	ne_ssl_cert_identity.3 ne_ssl_cert_signedby.3 \
-	ne_ssl_cert_identity.3 ne_ssl_cert_subject.3 \
-	ne_ssl_cert_read.3 ne_ssl_cert_export.3 \
-	ne_ssl_cert_read.3 ne_ssl_cert_import.3 \
-	ne_ssl_cert_read.3 ne_ssl_cert_write.3 \
-	ne_ssl_clicert_read.3 ne_ssl_clicert_decrypt.3 \
-	ne_ssl_clicert_read.3 ne_ssl_clicert_encrypted.3 \
-	ne_ssl_clicert_read.3 ne_ssl_clicert_free.3 \
-	ne_ssl_clicert_read.3 ne_ssl_clicert_name.3 \
-	ne_ssl_clicert_read.3 ne_ssl_clicert_owner.3 \
-	ne_ssl_readable_dname.3 ne_ssl_dname_cmp.3 \
-	ne_ssl_trust_cert.3 ne_ssl_trust_default_ca.3 \
-	ne_token.3 ne_qtoken.3 \
-	ne_version_match.3 ne_version_string.3 \
-	ne_xml_create.3 ne_xml_destroy.3
-
-PLIST_SUB+=	PORTVERSION=${PORTVERSION}
-
-post-install:
-	${INSTALL_MAN} ${WRKSRC}/doc/man/*.1 ${MANPREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/doc/man/*.3 ${MANPREFIX}/man/man3
-.ifndef NOPORTDOCS
-	(cd ${WRKSRC} ; ${MAKE} install-html)
-	${INSTALL_DATA} ${WRKSRC}/doc/using-neon.txt ${DOCSDIR}
-.endif
-
-.include <bsd.port.mk>
diff --git a/www/neon/distinfo b/www/neon/distinfo
deleted file mode 100644
index 6263ee8f7172..000000000000
--- a/www/neon/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (neon-0.26.4.tar.gz) = 2d11fff51ffa856fc6b5d4bd801d6cc4
-SHA256 (neon-0.26.4.tar.gz) = 92d9a9f097734e9baa542febae9419b0d22540e3158e245220fea1b078b159de
-SIZE (neon-0.26.4.tar.gz) = 794225
diff --git a/www/neon/files/patch-Makefile.in b/www/neon/files/patch-Makefile.in
deleted file mode 100644
index b0ea71eb41a3..000000000000
--- a/www/neon/files/patch-Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- Makefile.in.orig	Wed Feb  7 15:53:29 2007
-+++ Makefile.in	Wed Feb  7 16:34:12 2007
-@@ -21,7 +21,7 @@
- man1dir = $(mandir)/man1
- man3dir = $(mandir)/man3
- datadir = @datadir@
--docdir = $(datadir)/doc/neon-@NEON_VERSION@
-+docdir = $(datadir)/doc/neon
- includedir = @includedir@
- neonincludes = $(includedir)/neon
- pkgconfigdir = $(prefix)/libdata/pkgconfig
-@@ -147,7 +147,7 @@
- 	@echo "ERROR: purposes only; this copy of neon must not be installed."
- 	@false
- 
--install-yes: install-lib install-headers install-config install-docs install-nls
-+install-yes: install-lib install-headers install-config install-nls
- 
- # libtool does all the necessary magic here
- install-lib: subdirs
diff --git a/www/neon/files/patch-ltmain.sh b/www/neon/files/patch-ltmain.sh
deleted file mode 100644
index f44f68cc1521..000000000000
--- a/www/neon/files/patch-ltmain.sh
+++ /dev/null
@@ -1,15 +0,0 @@
---- ltmain.sh.orig	Wed Feb  7 15:52:17 2007
-+++ ltmain.sh	Wed Feb  7 15:52:58 2007
-@@ -6038,10 +6038,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false ; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/www/neon/pkg-descr b/www/neon/pkg-descr
deleted file mode 100644
index 3f8647c6bcf3..000000000000
--- a/www/neon/pkg-descr
+++ /dev/null
@@ -1,19 +0,0 @@
-Neon is  an HTTP and  WebDAV client library for  Unix systems, with  a C
-interface. Featuring:
-
-	. High-level interface to HTTP and WebDAV methods
-	  (PUT, GET, HEAD etc) 
-	. Low-level interface to HTTP request handling, to allow
-	  implementing new methods easily. 
-	. HTTP/1.1 and HTTP/1.0 persistent connections 
-	. RFC2617 basic and digest authentication
-	  (including auth-int, md5-sess) 
-	. Proxy support (including basic/digest authentication) 
-	. Generic WebDAV 207 XML response handling mechanism 
-	. XML parsing using the expat or libxml parsers 
-	. Easy generation of error messages from 207 error responses 
-	. WebDAV resource manipulation: MOVE, COPY, DELETE, MKCOL
-	. WebDAV metadata support: set and remove properties, query
-	  any set of properties (PROPPATCH/PROPFIND).
-
-WWW: http://www.webdav.org/neon/
diff --git a/www/neon/pkg-plist b/www/neon/pkg-plist
deleted file mode 100644
index 4da8200159bf..000000000000
--- a/www/neon/pkg-plist
+++ /dev/null
@@ -1,84 +0,0 @@
-bin/neon-config
-include/neon/ne_207.h
-include/neon/ne_acl.h
-include/neon/ne_alloc.h
-include/neon/ne_auth.h
-include/neon/ne_basic.h
-include/neon/ne_compress.h
-include/neon/ne_dates.h
-include/neon/ne_defs.h
-include/neon/ne_i18n.h
-include/neon/ne_locks.h
-include/neon/ne_md5.h
-include/neon/ne_props.h
-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
-include/neon/ne_xmlreq.h
-lib/libneon.so.26
-lib/libneon.so
-lib/libneon.la
-lib/libneon.a
-libdata/pkgconfig/neon.pc
-%%NLS%%share/locale/cs/LC_MESSAGES/neon.mo
-%%NLS%%share/locale/de/LC_MESSAGES/neon.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/neon.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/neon.mo
-%%NLS%%share/locale/nn/LC_MESSAGES/neon.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/neon.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/neon.mo
-%%NLS%%share/locale/zh/LC_MESSAGES/neon.mo
-%%PORTDOCS%%%%DOCSDIR%%/html/api.html
-%%PORTDOCS%%%%DOCSDIR%%/html/biblio.html
-%%PORTDOCS%%%%DOCSDIR%%/html/compliance.html
-%%PORTDOCS%%%%DOCSDIR%%/html/features.html
-%%PORTDOCS%%%%DOCSDIR%%/html/index.html
-%%PORTDOCS%%%%DOCSDIR%%/html/intro.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ref.html
-%%PORTDOCS%%%%DOCSDIR%%/html/refalloc.html
-%%PORTDOCS%%%%DOCSDIR%%/html/refauth.html
-%%PORTDOCS%%%%DOCSDIR%%/html/refbuf.html
-%%PORTDOCS%%%%DOCSDIR%%/html/refbufapp.html
-%%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/reffeat.html
-%%PORTDOCS%%%%DOCSDIR%%/html/refgetst.html
-%%PORTDOCS%%%%DOCSDIR%%/html/refi18n.html
-%%PORTDOCS%%%%DOCSDIR%%/html/refiaddr.html
-%%PORTDOCS%%%%DOCSDIR%%/html/refneon.html
-%%PORTDOCS%%%%DOCSDIR%%/html/refopts.html
-%%PORTDOCS%%%%DOCSDIR%%/html/refreq.html
-%%PORTDOCS%%%%DOCSDIR%%/html/refreqbody.html
-%%PORTDOCS%%%%DOCSDIR%%/html/refreqhdr.html
-%%PORTDOCS%%%%DOCSDIR%%/html/refreqopts.html
-%%PORTDOCS%%%%DOCSDIR%%/html/refresolve.html
-%%PORTDOCS%%%%DOCSDIR%%/html/refresphdr.html
-%%PORTDOCS%%%%DOCSDIR%%/html/refsess.html
-%%PORTDOCS%%%%DOCSDIR%%/html/refshave.html
-%%PORTDOCS%%%%DOCSDIR%%/html/refsockinit.html
-%%PORTDOCS%%%%DOCSDIR%%/html/refsslca.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/refxml.html
-%%PORTDOCS%%%%DOCSDIR%%/html/using.html
-%%PORTDOCS%%%%DOCSDIR%%/html/xml.html
-%%PORTDOCS%%%%DOCSDIR%%/using-neon.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm include/neon
diff --git a/www/neonpp/Makefile b/www/neonpp/Makefile
index 9f948c57bb89..1bf3d1d7df95 100644
--- a/www/neonpp/Makefile
+++ b/www/neonpp/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	novel@FreeBSD.org
 COMMENT=	C++ wrapper library for neon
 
 LIB_DEPENDS=	sigc-2.0.0:${PORTSDIR}/devel/libsigc++20 \
-		neon.26:${PORTSDIR}/www/neon
+		neon.26:${PORTSDIR}/www/neon26
 
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
diff --git a/www/sitecopy/Makefile b/www/sitecopy/Makefile
index 30723975cc59..400c03a272c5 100644
--- a/www/sitecopy/Makefile
+++ b/www/sitecopy/Makefile
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR=	distfiles
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Maintains remote websites, uses FTP or WebDAV to sync up with local copy
 
-LIB_DEPENDS=	neon.26:${PORTSDIR}/www/neon
+LIB_DEPENDS=	neon.26:${PORTSDIR}/www/neon26
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CC="${CC} -I${LOCALBASE}/include" \