12 files changed, 28 insertions, 48 deletions

diff --git a/www/neon/Makefile b/www/neon/Makefile
index 0e496efb91cf..c675257358de 100644
--- a/www/neon/Makefile
+++ b/www/neon/Makefile
@@ -6,25 +6,21 @@
 #
 
 PORTNAME=	neon
-PORTVERSION=	0.11.0
+PORTVERSION=	0.12.0
 CATEGORIES=	www
 MASTER_SITES=	http://www.webdav.org/neon/
 
 MAINTAINER=	olgeni@FreeBSD.org
 
-LIB_DEPENDS=	expat:${PORTSDIR}/textproc/expat \
-		xml:${PORTSDIR}/textproc/libxml
+LIB_DEPENDS=	xml.5:${PORTSDIR}/textproc/libxml
 
 .ifndef NO_OPENSSL
 USE_OPENSSL=	yes
 .endif
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-ssl=${OPENSSLBASE} --with-expat=${PREFIX}/include/xml \
-		--with-extra-libs=${PREFIX}/lib
-
-ALL_TARGET=	all
-INSTALL_TARGET=	install
+USE_LIBTOOL=	yes
+CONFIGURE_ARGS=	--with-ssl=${OPENSSLBASE} \
+		--enable-xml
 
 .ifndef NOPORTDOCS
 post-install:
diff --git a/www/neon/distinfo b/www/neon/distinfo
index 919fbfc9ba44..974e05b82b18 100644
--- a/www/neon/distinfo
+++ b/www/neon/distinfo
@@ -1 +1 @@
-MD5 (neon-0.11.0.tar.gz) = 1ffb8dd4641c550d2e93f9ff6445a7a7
+MD5 (neon-0.12.0.tar.gz) = 3a2b77eaafe140bea57fd3d66835a44f
diff --git a/www/neon/pkg-plist b/www/neon/pkg-plist
index 7e21f9bea774..109194049248 100644
--- a/www/neon/pkg-plist
+++ b/www/neon/pkg-plist
@@ -18,9 +18,8 @@ include/neon/nsocket.h
 include/neon/string_utils.h
 include/neon/uri.h
 lib/libneon.a
-lib/libneon.la
 lib/libneon.so
-lib/libneon.so.11
+lib/libneon.so.12
 %%PORTDOCS%%share/doc/neon/using-neon.txt
 %%PORTDOCS%%@dirrm share/doc/neon
 @dirrm include/neon
diff --git a/www/neon26/Makefile b/www/neon26/Makefile
index 0e496efb91cf..c675257358de 100644
--- a/www/neon26/Makefile
+++ b/www/neon26/Makefile
@@ -6,25 +6,21 @@
 #
 
 PORTNAME=	neon
-PORTVERSION=	0.11.0
+PORTVERSION=	0.12.0
 CATEGORIES=	www
 MASTER_SITES=	http://www.webdav.org/neon/
 
 MAINTAINER=	olgeni@FreeBSD.org
 
-LIB_DEPENDS=	expat:${PORTSDIR}/textproc/expat \
-		xml:${PORTSDIR}/textproc/libxml
+LIB_DEPENDS=	xml.5:${PORTSDIR}/textproc/libxml
 
 .ifndef NO_OPENSSL
 USE_OPENSSL=	yes
 .endif
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-ssl=${OPENSSLBASE} --with-expat=${PREFIX}/include/xml \
-		--with-extra-libs=${PREFIX}/lib
-
-ALL_TARGET=	all
-INSTALL_TARGET=	install
+USE_LIBTOOL=	yes
+CONFIGURE_ARGS=	--with-ssl=${OPENSSLBASE} \
+		--enable-xml
 
 .ifndef NOPORTDOCS
 post-install:
diff --git a/www/neon26/distinfo b/www/neon26/distinfo
index 919fbfc9ba44..974e05b82b18 100644
--- a/www/neon26/distinfo
+++ b/www/neon26/distinfo
@@ -1 +1 @@
-MD5 (neon-0.11.0.tar.gz) = 1ffb8dd4641c550d2e93f9ff6445a7a7
+MD5 (neon-0.12.0.tar.gz) = 3a2b77eaafe140bea57fd3d66835a44f
diff --git a/www/neon26/pkg-plist b/www/neon26/pkg-plist
index 7e21f9bea774..109194049248 100644
--- a/www/neon26/pkg-plist
+++ b/www/neon26/pkg-plist
@@ -18,9 +18,8 @@ include/neon/nsocket.h
 include/neon/string_utils.h
 include/neon/uri.h
 lib/libneon.a
-lib/libneon.la
 lib/libneon.so
-lib/libneon.so.11
+lib/libneon.so.12
 %%PORTDOCS%%share/doc/neon/using-neon.txt
 %%PORTDOCS%%@dirrm share/doc/neon
 @dirrm include/neon
diff --git a/www/neon28/Makefile b/www/neon28/Makefile
index 0e496efb91cf..c675257358de 100644
--- a/www/neon28/Makefile
+++ b/www/neon28/Makefile
@@ -6,25 +6,21 @@
 #
 
 PORTNAME=	neon
-PORTVERSION=	0.11.0
+PORTVERSION=	0.12.0
 CATEGORIES=	www
 MASTER_SITES=	http://www.webdav.org/neon/
 
 MAINTAINER=	olgeni@FreeBSD.org
 
-LIB_DEPENDS=	expat:${PORTSDIR}/textproc/expat \
-		xml:${PORTSDIR}/textproc/libxml
+LIB_DEPENDS=	xml.5:${PORTSDIR}/textproc/libxml
 
 .ifndef NO_OPENSSL
 USE_OPENSSL=	yes
 .endif
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-ssl=${OPENSSLBASE} --with-expat=${PREFIX}/include/xml \
-		--with-extra-libs=${PREFIX}/lib
-
-ALL_TARGET=	all
-INSTALL_TARGET=	install
+USE_LIBTOOL=	yes
+CONFIGURE_ARGS=	--with-ssl=${OPENSSLBASE} \
+		--enable-xml
 
 .ifndef NOPORTDOCS
 post-install:
diff --git a/www/neon28/distinfo b/www/neon28/distinfo
index 919fbfc9ba44..974e05b82b18 100644
--- a/www/neon28/distinfo
+++ b/www/neon28/distinfo
@@ -1 +1 @@
-MD5 (neon-0.11.0.tar.gz) = 1ffb8dd4641c550d2e93f9ff6445a7a7
+MD5 (neon-0.12.0.tar.gz) = 3a2b77eaafe140bea57fd3d66835a44f
diff --git a/www/neon28/pkg-plist b/www/neon28/pkg-plist
index 7e21f9bea774..109194049248 100644
--- a/www/neon28/pkg-plist
+++ b/www/neon28/pkg-plist
@@ -18,9 +18,8 @@ include/neon/nsocket.h
 include/neon/string_utils.h
 include/neon/uri.h
 lib/libneon.a
-lib/libneon.la
 lib/libneon.so
-lib/libneon.so.11
+lib/libneon.so.12
 %%PORTDOCS%%share/doc/neon/using-neon.txt
 %%PORTDOCS%%@dirrm share/doc/neon
 @dirrm include/neon
diff --git a/www/neon29/Makefile b/www/neon29/Makefile
index 0e496efb91cf..c675257358de 100644
--- a/www/neon29/Makefile
+++ b/www/neon29/Makefile
@@ -6,25 +6,21 @@
 #
 
 PORTNAME=	neon
-PORTVERSION=	0.11.0
+PORTVERSION=	0.12.0
 CATEGORIES=	www
 MASTER_SITES=	http://www.webdav.org/neon/
 
 MAINTAINER=	olgeni@FreeBSD.org
 
-LIB_DEPENDS=	expat:${PORTSDIR}/textproc/expat \
-		xml:${PORTSDIR}/textproc/libxml
+LIB_DEPENDS=	xml.5:${PORTSDIR}/textproc/libxml
 
 .ifndef NO_OPENSSL
 USE_OPENSSL=	yes
 .endif
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-ssl=${OPENSSLBASE} --with-expat=${PREFIX}/include/xml \
-		--with-extra-libs=${PREFIX}/lib
-
-ALL_TARGET=	all
-INSTALL_TARGET=	install
+USE_LIBTOOL=	yes
+CONFIGURE_ARGS=	--with-ssl=${OPENSSLBASE} \
+		--enable-xml
 
 .ifndef NOPORTDOCS
 post-install:
diff --git a/www/neon29/distinfo b/www/neon29/distinfo
index 919fbfc9ba44..974e05b82b18 100644
--- a/www/neon29/distinfo
+++ b/www/neon29/distinfo
@@ -1 +1 @@
-MD5 (neon-0.11.0.tar.gz) = 1ffb8dd4641c550d2e93f9ff6445a7a7
+MD5 (neon-0.12.0.tar.gz) = 3a2b77eaafe140bea57fd3d66835a44f
diff --git a/www/neon29/pkg-plist b/www/neon29/pkg-plist
index 7e21f9bea774..109194049248 100644
--- a/www/neon29/pkg-plist
+++ b/www/neon29/pkg-plist
@@ -18,9 +18,8 @@ include/neon/nsocket.h
 include/neon/string_utils.h
 include/neon/uri.h
 lib/libneon.a
-lib/libneon.la
 lib/libneon.so
-lib/libneon.so.11
+lib/libneon.so.12
 %%PORTDOCS%%share/doc/neon/using-neon.txt
 %%PORTDOCS%%@dirrm share/doc/neon
 @dirrm include/neon