diff --git a/www/neon29/Makefile b/www/neon29/Makefile
index b582fe9c5309..ab63d04b672f 100644
--- a/www/neon29/Makefile
+++ b/www/neon29/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	neon29
 PORTVERSION=	0.29.6
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	www
 MASTER_SITES=	http://www.webdav.org/neon/
 DISTNAME=	neon-${PORTVERSION}
@@ -11,8 +11,13 @@ DISTNAME=	neon-${PORTVERSION}
 MAINTAINER=	lev@FreeBSD.org
 COMMENT=	HTTP and WebDAV client library for Unix systems
 
-CONFLICTS=	neon2[^9]-[0-9]*
+LICENSE=	GPLv2
 
+USES=		pathfix libtool
+USE_LDCONFIG=	yes
+GNU_CONFIGURE=	yes
+
+OPTIONS_SUB=		yes
 OPTIONS_DEFINE=		CA_BUNDLE DOCS GSSAPI NLS OPENSSL PROXY
 OPTIONS_DEFAULT=	CA_BUNDLE EXPAT GSSAPI NLS OPENSSL
 OPTIONS_SINGLE=		XML
@@ -23,63 +28,37 @@ LIBXML_DESC=		libxml2 XML parser support
 PROXY_DESC=		libproxy support
 XML_DESC=		XML parser library
 
-USE_LDCONFIG=	yes
-
-USES=		pathfix libtool
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-shared \
-		--with-libs=${LOCALBASE}:${PREFIX}
-
 CA_BUNDLE_CONFIGURE_ON=	--with-ca-bundle=${LOCALBASE}/share/certs/ca-root-nss.crt
 CA_BUNDLE_RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
+EXPAT_CONFIGURE_WITH=	expat
+EXPAT_LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+GSSAPI_CONFIGURE_WITH=	gssapi
+LIBXML_CONFIGURE_WITH=	libxml2
+LIBXML_USE=		GNOME=libxml2
+NLS_CONFIGURE_ENABLE=	nls
+NLS_USES=		gettext
+OPENSSL_CONFIGURE_WITH=	ssl
+OPENSSL_USE=		OPENSSL=yes
+PROXY_CONFIGURE_WITH=	libproxy
+PROXY_LIB_DEPENDS=	libproxy.so:${PORTSDIR}/net/libproxy
 
 .include <bsd.port.options.mk>
 
+CONFIGURE_ARGS+=--enable-shared \
+		--with-libs=${LOCALBASE}:${PREFIX}
+
 .if ${PORT_OPTIONS:MCA_BUNDLE} && !${PORT_OPTIONS:MOPENSSL}
 WARNING+=	"OpenSSL need for CA bundle support"
 WARNING+=	"Enable the OPENSSL option or disable the CA_BUNDLE option"
 .endif
 
-.if ${PORT_OPTIONS:MEXPAT}
-CONFIGURE_ARGS+=--with-expat
-LIB_DEPENDS+=	libexpat.so:${PORTSDIR}/textproc/expat2
-.endif
-
-.if ${PORT_OPTIONS:MLIBXML}
-CONFIGURE_ARGS+=--with-libxml2
-USE_GNOME+=	libxml2
-.endif
-
-.if ${PORT_OPTIONS:MOPENSSL}
-CONFIGURE_ARGS+=--with-ssl
-USE_OPENSSL=	yes
-.endif
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
-
-.if ! ${PORT_OPTIONS:MGSSAPI}
-CONFIGURE_ARGS+=--without-gssapi
-.endif
-
-.if ${PORT_OPTIONS:MPROXY}
-CONFIGURE_ARGS+=--with-libproxy
-LIB_DEPENDS+=	libproxy.so:${PORTSDIR}/net/libproxy
-.else
-CONFIGURE_ARGS+=--without-libproxy
-.endif
-
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 DOCSDIR=	${PREFIX}/share/doc/neon
 
+post-patch:
+	${REINPLACE_CMD} -e 's|-@NEON_VERSION@$$||' ${WRKSRC}/Makefile.in
+
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/doc/man/*.1 ${STAGEDIR}${MANPREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/doc/man/*.3 ${STAGEDIR}${MANPREFIX}/man/man3
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libneon.so.27.*
 
 .include <bsd.port.mk>
diff --git a/www/neon29/files/patch-Makefile.in b/www/neon29/files/patch-Makefile.in
deleted file mode 100644
index d4b49175b09d..000000000000
--- a/www/neon29/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +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
diff --git a/www/neon29/pkg-plist b/www/neon29/pkg-plist
index 7ffdea322e9d..f78251fba767 100644
--- a/www/neon29/pkg-plist
+++ b/www/neon29/pkg-plist
@@ -178,6 +178,3 @@ man/man3/neon.3.gz
 %%NLS%%share/locale/ru/LC_MESSAGES/neon.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/neon.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/neon.mo
-@dirrm include/neon
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%