- Makes neon29 our default neon library. The neon 0.27.x to 0.29.x are API and

ABI backwards compatible. It is unnecessary to have more than one same libraries (ie: neon28 and neon29) as it creates issue in our ports tree such as CONFLICTS and made our Makefile complicate. - Remove www/neonpp and www/neon28. - Add USE_GNOME=ltverhack; it corrects the shared library version by change from libneon.so.29 to libneon.so.27. It won't get bump again with no reason unless ABI changes. - Bump the PORTREVISION on all ports and chase the shared library change. - Add info in the UPDATING for how to rebuild on all ports that depend on neon. PR: ports/148295 Approved by: lev (maintainer timeout, no respone for months), portmgr Tested by: pointyhat-exp by pav
author: Jeremy Messenger <mezz@FreeBSD.org> 2010-07-30 22:14:49 +0000
committer: Jeremy Messenger <mezz@FreeBSD.org> 2010-07-30 22:14:49 +0000
commit: 113641e728e938d480f5c33ddd6a1ad6b06c2ab7 (patch)
tree: 13d8a1389a6f4c52c2e1d9583ff1313b5292a6bb
parent: 7bb5db52e1a44398d3bc9df3190bdfa7fc4375ec (diff)
download: ports-113641e728e938d480f5c33ddd6a1ad6b06c2ab7.tar.gz
ports-113641e728e938d480f5c33ddd6a1ad6b06c2ab7.zip
37 files changed, 70 insertions, 436 deletions
diff --git a/MOVED b/MOVED
index 1a7aba9d167a..71a7120aec2a 100644
--- a/MOVED
+++ b/MOVED
@@ -4461,3 +4461,5 @@ mail/squirrelmail-compatibility-plugin1|mail/squirrelmail-compatibility-plugin|2
 mail/squirrelmail-newuser_wiz-plugin|mail/squirrelmail-askuserinfo-plugin|2010-07-21|Has expired: use mail/squirrelmail-askuserinfo-plugin
 textproc/mini-xml|textproc/mxml|2010-07-25|Duplicate port
 net/gir-repository-avahi|net/avahi-app|2010-07-25|Handled by net/avahi-app now
+www/neonpp||2010-07-30|Does not build with neon 0.28 and above
+www/neon28|www/neon29|2010-07-30|Replaced by neon 0.29.x
diff --git a/UPDATING b/UPDATING
index 0a5fc3fc3d23..6a53faab70c0 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,23 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20100730:
+  AFFECTS: users of www/neon28 and www/neon29
+  AUTHOR: mezz@FreeBSD.org
+
+  Makes neon29 our default neon library in the ports tree. The www/neon28
+  has been removed and www/neon29's shared library version has been changed.
+  You will have to rebuild all ports that depend on www/neon29. Do this:
+
+  Portmaster users:
+	portmaster -o www/neon29 www/neon28
+	portmaster -r neon29-
+
+  Portupgrade user:
+	env DISABLE_CONFLICTS=1 portupgrade -o www/neon29 -f neon28-\*
+	pkgdb -Ff
+	portupgrade -rf www/neon29-\*
+
 20100728:
   AFFECTS: users of textproc/nltk
   AUTHOR: clsung@FreeBSD.org
@@ -20,7 +37,6 @@ you update your ports collection, before attempting any port upgrades.
     # cd /usr/ports/textproc/nltk/
     # make install clean
 
-
 20100727:
   AFFECTS: users of security/libgcrypt
   AUTHOR: wxs@FreeBSD.org
diff --git a/archivers/rpm5/Makefile b/archivers/rpm5/Makefile
index ea9064490c88..ac3a90f79e19 100644
--- a/archivers/rpm5/Makefile
+++ b/archivers/rpm5/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	rpm
 PORTVERSION=	5.0.3
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	archivers
 MASTER_SITES=	http://rpm5.org/files/rpm/rpm-5.0/
 PATCHFILES=	rpm-5.0.3.1.patch
@@ -19,7 +19,7 @@ LIB_DEPENDS=	db-${DB_VERSION:C/(.)/\1./}:${PORTSDIR}/databases/db${DB_VERSION} \
 		sqlite3.8:${PORTSDIR}/databases/sqlite3 \
 		popt.0:${PORTSDIR}/devel/popt \
 		beecrypt.7:${PORTSDIR}/security/beecrypt \
-		neon.28:${PORTSDIR}/www/neon28 \
+		neon.27:${PORTSDIR}/www/neon29 \
 		magic:${PORTSDIR}/sysutils/file \
 		xar:${PORTSDIR}/archivers/xar \
 		pcre.0:${PORTSDIR}/devel/pcre
diff --git a/audio/libmusicbrainz3/Makefile b/audio/libmusicbrainz3/Makefile
index 4356a88455a2..dc20a40cb744 100644
--- a/audio/libmusicbrainz3/Makefile
+++ b/audio/libmusicbrainz3/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libmusicbrainz3
 PORTVERSION=	3.0.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.musicbrainz.org/pub/musicbrainz/ \
 		http://uk.musicbrainz.org/pub/musicbrainz/ \
@@ -17,7 +17,8 @@ DISTNAME=	${PORTNAME:S/3//}-${PORTVERSION}
 MAINTAINER=	bsdkaffee@gmail.com
 COMMENT=	MusicBrainz client library for audio metadata lookup
 
-LIB_DEPENDS=	discid:${PORTSDIR}/audio/libdiscid
+LIB_DEPENDS=	discid:${PORTSDIR}/audio/libdiscid \
+		neon.27:${PORTSDIR}/www/neon29
 
 USE_CMAKE=	yes
 USE_GNOME=	pkgconfig
@@ -25,18 +26,8 @@ USE_LDCONFIG=	yes
 
 MAKE_JOBS_SAFE=	yes
 
-.include <bsd.port.pre.mk>
-
-.if exists(${LOCALBASE}/bin/neon-config)
-NEON_VER!=	${LOCALBASE}/bin/neon-config --version | \
-		${SED} -n -E 's/^neon [0-9]+\.([0-9]+)\..*$$/\1/p'
-.else
-NEON_VER=	29
-.endif
-LIB_DEPENDS+=	neon.${NEON_VER}:${PORTSDIR}/www/neon${NEON_VER}
-
 pre-configure:
 	${REINPLACE_CMD} -e '/pkgconfig/s|$${LIB_INSTALL_DIR}|libdata|' \
 		-e '/CppUnit/d' ${WRKSRC}/CMakeLists.txt
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/libmusicbrainz4/Makefile b/audio/libmusicbrainz4/Makefile
index 4356a88455a2..dc20a40cb744 100644
--- a/audio/libmusicbrainz4/Makefile
+++ b/audio/libmusicbrainz4/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libmusicbrainz3
 PORTVERSION=	3.0.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.musicbrainz.org/pub/musicbrainz/ \
 		http://uk.musicbrainz.org/pub/musicbrainz/ \
@@ -17,7 +17,8 @@ DISTNAME=	${PORTNAME:S/3//}-${PORTVERSION}
 MAINTAINER=	bsdkaffee@gmail.com
 COMMENT=	MusicBrainz client library for audio metadata lookup
 
-LIB_DEPENDS=	discid:${PORTSDIR}/audio/libdiscid
+LIB_DEPENDS=	discid:${PORTSDIR}/audio/libdiscid \
+		neon.27:${PORTSDIR}/www/neon29
 
 USE_CMAKE=	yes
 USE_GNOME=	pkgconfig
@@ -25,18 +26,8 @@ USE_LDCONFIG=	yes
 
 MAKE_JOBS_SAFE=	yes
 
-.include <bsd.port.pre.mk>
-
-.if exists(${LOCALBASE}/bin/neon-config)
-NEON_VER!=	${LOCALBASE}/bin/neon-config --version | \
-		${SED} -n -E 's/^neon [0-9]+\.([0-9]+)\..*$$/\1/p'
-.else
-NEON_VER=	29
-.endif
-LIB_DEPENDS+=	neon.${NEON_VER}:${PORTSDIR}/www/neon${NEON_VER}
-
 pre-configure:
 	${REINPLACE_CMD} -e '/pkgconfig/s|$${LIB_INSTALL_DIR}|libdata|' \
 		-e '/CppUnit/d' ${WRKSRC}/CMakeLists.txt
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/libmusicbrainz5/Makefile b/audio/libmusicbrainz5/Makefile
index 4356a88455a2..dc20a40cb744 100644
--- a/audio/libmusicbrainz5/Makefile
+++ b/audio/libmusicbrainz5/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libmusicbrainz3
 PORTVERSION=	3.0.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.musicbrainz.org/pub/musicbrainz/ \
 		http://uk.musicbrainz.org/pub/musicbrainz/ \
@@ -17,7 +17,8 @@ DISTNAME=	${PORTNAME:S/3//}-${PORTVERSION}
 MAINTAINER=	bsdkaffee@gmail.com
 COMMENT=	MusicBrainz client library for audio metadata lookup
 
-LIB_DEPENDS=	discid:${PORTSDIR}/audio/libdiscid
+LIB_DEPENDS=	discid:${PORTSDIR}/audio/libdiscid \
+		neon.27:${PORTSDIR}/www/neon29
 
 USE_CMAKE=	yes
 USE_GNOME=	pkgconfig
@@ -25,18 +26,8 @@ USE_LDCONFIG=	yes
 
 MAKE_JOBS_SAFE=	yes
 
-.include <bsd.port.pre.mk>
-
-.if exists(${LOCALBASE}/bin/neon-config)
-NEON_VER!=	${LOCALBASE}/bin/neon-config --version | \
-		${SED} -n -E 's/^neon [0-9]+\.([0-9]+)\..*$$/\1/p'
-.else
-NEON_VER=	29
-.endif
-LIB_DEPENDS+=	neon.${NEON_VER}:${PORTSDIR}/www/neon${NEON_VER}
-
 pre-configure:
 	${REINPLACE_CMD} -e '/pkgconfig/s|$${LIB_INSTALL_DIR}|libdata|' \
 		-e '/CppUnit/d' ${WRKSRC}/CMakeLists.txt
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/deskutils/libopensync-plugin-sunbird/Makefile b/deskutils/libopensync-plugin-sunbird/Makefile
index 299cb7b93a6b..10f6af897528 100644
--- a/deskutils/libopensync-plugin-sunbird/Makefile
+++ b/deskutils/libopensync-plugin-sunbird/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libopensync-plugin-sunbird
 PORTVERSION=	0.22
+PORTREVISION=	1
 CATEGORIES=	deskutils
 MASTER_SITES=	http://www.opensync.org/download/releases/${PORTVERSION}/
 
@@ -14,7 +15,7 @@ MAINTAINER=	avl@FreeBSD.org
 COMMENT=	Sunbird plugin for the OpenSync framework
 
 LIB_DEPENDS=	opensync.0:${PORTSDIR}/devel/libopensync022 \
-		neon.28:${PORTSDIR}/www/neon28
+		neon.27:${PORTSDIR}/www/neon29
 
 MAKE_JOBS_SAFE=	yes
 
diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile
index c7c451df9dd2..fbf04e941e27 100644
--- a/devel/anjuta/Makefile
+++ b/devel/anjuta/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	anjuta
 PORTVERSION=	2.30.2.1
+PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -65,12 +66,8 @@ OPTIONS=	SVN "Build subversion plugin" off \
 
 .if defined(WITH_SVN)
 BUILD_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
-LIB_DEPENDS+=	apr-1.4:${PORTSDIR}/devel/apr1
-.if exists(${LOCALBASE}/lib/libneon.so.29)
-LIB_DEPENDS+=	neon.29:${PORTSDIR}/www/neon29
-.else
-LIB_DEPENDS+=	neon.28:${PORTSDIR}/www/neon28
-.endif
+LIB_DEPENDS+=	apr-1.4:${PORTSDIR}/devel/apr1 \
+		neon.27:${PORTSDIR}/www/neon29
 RUN_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
 PLIST_SUB+=	SVN=""
 .else
diff --git a/devel/baz/Makefile b/devel/baz/Makefile
index 8d6acf798e86..13586143523f 100644
--- a/devel/baz/Makefile
+++ b/devel/baz/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bazaar
 PORTVERSION=	1.4.2
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	devel
 MASTER_SITES=	http://bazaar-vcs.org/releases/src/obsolete/
 DISTNAME=	bazaar_${PORTVERSION}
@@ -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.28:${PORTSDIR}/www/neon28 \
+LIB_DEPENDS=	neon.27:${PORTSDIR}/www/neon29 \
 		gpgme.18:${PORTSDIR}/security/gpgme
 
 CONFLICTS=	gd-2.*
diff --git a/devel/bazaar/Makefile b/devel/bazaar/Makefile
index 8d6acf798e86..13586143523f 100644
--- a/devel/bazaar/Makefile
+++ b/devel/bazaar/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bazaar
 PORTVERSION=	1.4.2
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	devel
 MASTER_SITES=	http://bazaar-vcs.org/releases/src/obsolete/
 DISTNAME=	bazaar_${PORTVERSION}
@@ -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.28:${PORTSDIR}/www/neon28 \
+LIB_DEPENDS=	neon.27:${PORTSDIR}/www/neon29 \
 		gpgme.18:${PORTSDIR}/security/gpgme
 
 CONFLICTS=	gd-2.*
diff --git a/devel/subcommander/Makefile b/devel/subcommander/Makefile
index 774206a348e9..efb8c13c1177 100644
--- a/devel/subcommander/Makefile
+++ b/devel/subcommander/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	subcommander
 PORTVERSION=	1.2.3
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	devel
 MASTER_SITES=	http://subcommander.tigris.org/files/documents/1759/42385/
 DISTNAME=	Subcommander-${PORTVERSION}
@@ -15,7 +15,7 @@ DISTNAME=	Subcommander-${PORTVERSION}
 MAINTAINER=	cyberbotx@cyberbotx.com
 COMMENT=	Qt based multiplatform subversion client, diff & merge tool
 
-LIB_DEPENDS=	neon.29:${PORTSDIR}/www/neon29 \
+LIB_DEPENDS=	neon.27:${PORTSDIR}/www/neon29 \
 		boost_thread.4:${PORTSDIR}/devel/boost-libs \
 		svn_client-1.0:${PORTSDIR}/devel/subversion
 
diff --git a/devel/subcommander2/Makefile b/devel/subcommander2/Makefile
index 8e7b372ef196..68df63755e2e 100644
--- a/devel/subcommander2/Makefile
+++ b/devel/subcommander2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	subcommander
 PORTVERSION=	2.0.0.b5
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel
 MASTER_SITES=	http://subcommander.tigris.org/files/documents/1759/46766/
 DISTNAME=	Subcommander-${PORTVERSION:S/.b/b/g}p1
@@ -15,7 +15,7 @@ DISTNAME=	Subcommander-${PORTVERSION:S/.b/b/g}p1
 MAINTAINER=	cyberbotx@cyberbotx.com
 COMMENT=	Qt4 based multiplatform subversion client, diff & merge tool
 
-LIB_DEPENDS=	neon.29:${PORTSDIR}/www/neon29 \
+LIB_DEPENDS=	neon.27:${PORTSDIR}/www/neon29 \
 		boost_thread.4:${PORTSDIR}/devel/boost-libs \
 		svn_client-1.0:${PORTSDIR}/devel/subversion \
 		sasl2.2:${PORTSDIR}/security/cyrus-sasl2
diff --git a/devel/subversion-freebsd/Makefile b/devel/subversion-freebsd/Makefile
index 555c20bf9f6b..2ec1301b60fe 100644
--- a/devel/subversion-freebsd/Makefile
+++ b/devel/subversion-freebsd/Makefile
@@ -4,7 +4,7 @@
 #
 # $FreeBSD$
 
-PORTREVISION=	2
+PORTREVISION=	3
 PKGNAMESUFFIX=	-freebsd
 
 COMMENT=	Version control system with FreeBSD Project repo customizations
diff --git a/devel/subversion/Makefile.common b/devel/subversion/Makefile.common
index 4c20203b9143..c08956c743f3 100644
--- a/devel/subversion/Makefile.common
+++ b/devel/subversion/Makefile.common
@@ -6,7 +6,7 @@
 
 PORTNAME=	subversion
 PORTVERSION=	1.6.12
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES+=	devel
 MASTER_SITES=	http://subversion.tigris.org/downloads/:main \
 		http://svnbook.red-bean.com/en/1.5/:book
@@ -43,15 +43,7 @@ CONFIGURE_ARGS+=	--with-sqlite=${LOCALBASE}
 
 # Default is "on"
 .if !defined(WITHOUT_NEON)
-.if !defined(NEON_VER)
-.if exists(${LOCALBASE}/bin/neon-config)
-NEON_VER!=	${LOCALBASE}/bin/neon-config --version | \
-		${SED} -n -E  's/^neon [0-9]+\.([0-9]+)\..*$$/\1/p'
-.else
-NEON_VER=	29
-.endif
-.endif
-LIB_DEPENDS+=	neon.${NEON_VER}:${PORTSDIR}/www/neon${NEON_VER}
+LIB_DEPENDS+=	neon.27:${PORTSDIR}/www/neon29
 PLIST_SUB+=	NEON=""
 .else
 CONFIGURE_ARGS+=--without-neon
diff --git a/devel/subversion16/Makefile.common b/devel/subversion16/Makefile.common
index 4c20203b9143..c08956c743f3 100644
--- a/devel/subversion16/Makefile.common
+++ b/devel/subversion16/Makefile.common
@@ -6,7 +6,7 @@
 
 PORTNAME=	subversion
 PORTVERSION=	1.6.12
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES+=	devel
 MASTER_SITES=	http://subversion.tigris.org/downloads/:main \
 		http://svnbook.red-bean.com/en/1.5/:book
@@ -43,15 +43,7 @@ CONFIGURE_ARGS+=	--with-sqlite=${LOCALBASE}
 
 # Default is "on"
 .if !defined(WITHOUT_NEON)
-.if !defined(NEON_VER)
-.if exists(${LOCALBASE}/bin/neon-config)
-NEON_VER!=	${LOCALBASE}/bin/neon-config --version | \
-		${SED} -n -E  's/^neon [0-9]+\.([0-9]+)\..*$$/\1/p'
-.else
-NEON_VER=	29
-.endif
-.endif
-LIB_DEPENDS+=	neon.${NEON_VER}:${PORTSDIR}/www/neon${NEON_VER}
+LIB_DEPENDS+=	neon.27:${PORTSDIR}/www/neon29
 PLIST_SUB+=	NEON=""
 .else
 CONFIGURE_ARGS+=--without-neon
diff --git a/java/subversion-java/Makefile b/java/subversion-java/Makefile
index 3d7df14a75de..485a70a5b2ea 100644
--- a/java/subversion-java/Makefile
+++ b/java/subversion-java/Makefile
@@ -6,7 +6,7 @@
 #
 
 PKGNAMESUFFIX=	-java
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	java
 
 MAINTAINER=	lev@FreeBSD.org
diff --git a/multimedia/audacious-plugins/Makefile b/multimedia/audacious-plugins/Makefile
index 774cfab5cd84..6be2a92bb049 100644
--- a/multimedia/audacious-plugins/Makefile
+++ b/multimedia/audacious-plugins/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	audacious-plugins
 PORTVERSION=	2.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://distfiles.atheme.org/
 EXTRACT_SUFX=	.tgz
@@ -275,13 +275,7 @@ PLIST_SUB+=	PARANORMALPLUGIN="@comment "
 .endif
 
 .if !defined(WITHOUT_NEON)
-.if exists(${LOCALBASE}/bin/neon-config)
-NEON_VER!=	${LOCALBASE}/bin/neon-config --version | \
-		${SED} -n -E  's/^neon [0-9]+\.([0-9]+)\..*$$/\1/p'
-.else
-NEON_VER=	29
-.endif
-LIB_DEPENDS+=	neon.${NEON_VER}:${PORTSDIR}/www/neon${NEON_VER}
+LIB_DEPENDS+=	neon.27:${PORTSDIR}/www/neon29
 CONFIGURE_ARGS+=--enable-neon
 PLIST_SUB+=	NEONPLUGIN=""
 .else
diff --git a/multimedia/gstreamer-plugins/Makefile.common b/multimedia/gstreamer-plugins/Makefile.common
index 9c915fc6ac3e..08bf8dffc439 100644
--- a/multimedia/gstreamer-plugins/Makefile.common
+++ b/multimedia/gstreamer-plugins/Makefile.common
@@ -366,11 +366,7 @@ gst_nas_PLIST_FILES=	${GST_LIB_DIR}/libgstnassink.la \
 		${GST_LIB_DIR}/libgstnassink.so
 
 # neon
-.if exists(${LOCALBASE}/lib/libneon.so.29)
-gst_neon_LIB_DEPENDS+=	neon.29:${PORTSDIR}/www/neon29
-.else
-gst_neon_LIB_DEPENDS+=	neon.28:${PORTSDIR}/www/neon28
-.endif
+gst_neon_LIB_DEPENDS+=	neon.27:${PORTSDIR}/www/neon29
 gst_neon_CONFIGURE_ENV+=	NEON_CFLAGS="-I${LOCALBASE}/include/neon"
 gst_neon_PLIST_FILES=	${GST_LIB_DIR}/libgstneonhttpsrc.la \
 			${GST_LIB_DIR}/libgstneonhttpsrc.so
diff --git a/sysutils/fusefs-wdfs/Makefile b/sysutils/fusefs-wdfs/Makefile
index d5043c65b511..50759304c11d 100644
--- a/sysutils/fusefs-wdfs/Makefile
+++ b/sysutils/fusefs-wdfs/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wdfs
 PORTVERSION=	1.4.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	sysutils
 MASTER_SITES=	http://noedler.de/projekte/wdfs/
 PKGNAMEPREFIX=	fusefs-
@@ -16,7 +16,7 @@ MAINTAINER=	kamikaze@bsdforen.de
 COMMENT=	Mount remote WedDAV directories with Fuse
 
 LIB_DEPENDS=	fuse.2:${PORTSDIR}/sysutils/fusefs-libs \
-		neon.29:${PORTSDIR}/www/neon29
+		neon.27:${PORTSDIR}/www/neon29
 RUN_DEPENDS=	${LOCALBASE}/modules/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod
 
 GNU_CONFIGURE=	yes
diff --git a/sysutils/nut/Makefile b/sysutils/nut/Makefile
index e1dfacffb3c7..3edfcbdc19a2 100644
--- a/sysutils/nut/Makefile
+++ b/sysutils/nut/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nut
 PORTVERSION=	2.4.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.networkupstools.org/source/${PORTVERSION:R}/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.sig
@@ -127,7 +127,7 @@ PLIST_SUB+=	NUT_SNMP="@comment "
 .endif
 
 .if !defined(WITHOUT_NEON)
-LIB_DEPENDS+=	neon.29:${PORTSDIR}/www/neon29
+LIB_DEPENDS+=	neon.27:${PORTSDIR}/www/neon29
 CONFIGURE_ARGS+=	--with-neonxml
 MAN8+=		netxml-ups.8
 PLIST_SUB+=	NUT_NEON=""
diff --git a/sysutils/nut22/Makefile b/sysutils/nut22/Makefile
index afd16e338a8d..6847bc01c581 100644
--- a/sysutils/nut22/Makefile
+++ b/sysutils/nut22/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nut
 PORTVERSION=	2.2.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.networkupstools.org/source/${PORTVERSION:R}/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.sig
@@ -122,7 +122,7 @@ PLIST_SUB+=	NUT_SNMP="@comment "
 .endif
 
 .if !defined(WITHOUT_NEON)
-LIB_DEPENDS+=	neon.29:${PORTSDIR}/www/neon29
+LIB_DEPENDS+=	neon.27:${PORTSDIR}/www/neon29
 CONFIGURE_ARGS+=	--with-neonxml
 MAN8+=		netxml-ups.8
 PLIST_SUB+=	NUT_NEON=""
diff --git a/www/Makefile b/www/Makefile
index 4242fe8e9cbd..e1260ffe0ebe 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -585,9 +585,7 @@
     SUBDIR += nanoblogger
     SUBDIR += nanoblogger-extra
     SUBDIR += nd
-    SUBDIR += neon28
     SUBDIR += neon29
-    SUBDIR += neonpp
     SUBDIR += neowebscript
     SUBDIR += netoffice
     SUBDIR += netrik
diff --git a/www/cadaver/Makefile b/www/cadaver/Makefile
index 1b59f85fe6e4..82a94e2050e0 100644
--- a/www/cadaver/Makefile
+++ b/www/cadaver/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cadaver
 PORTVERSION=	0.23.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://www.webdav.org/cadaver/ \
 		http://www.tcbug.org/
diff --git a/www/gstreamer-plugins-neon/Makefile b/www/gstreamer-plugins-neon/Makefile
index d8345817b277..c9231a032ae4 100644
--- a/www/gstreamer-plugins-neon/Makefile
+++ b/www/gstreamer-plugins-neon/Makefile
@@ -6,7 +6,7 @@
 #    $MCom: ports/www/gstreamer-plugins-neon/Makefile,v 1.5 2008/03/19 14:05:38 ahze Exp $
 #
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	www
 
 COMMENT=	Gstreamer neon plugin
diff --git a/www/neon28/Makefile b/www/neon28/Makefile
deleted file mode 100644
index e139826c8698..000000000000
--- a/www/neon28/Makefile
+++ /dev/null
@@ -1,142 +0,0 @@
-# New ports collection makefile for: neon
-# Date created:		13 October 2000
-# Whom:			Mikhail Teterin <mi@aldan.algebra.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	neon28
-PORTVERSION=	0.28.6
-PORTREVISION=	1
-CATEGORIES=	www
-MASTER_SITES=	http://www.webdav.org/neon/
-DISTNAME=	neon-${PORTVERSION}
-
-MAINTAINER=	lev@FreeBSD.org
-COMMENT=	An HTTP and WebDAV client library for Unix systems
-
-CONFLICTS=	neon2[6|9]-[0-9]*
-
-USE_AUTOTOOLS=	libtool:22
-USE_LDCONFIG=	yes
-
-USE_GNOME=	gnomehack gnometarget
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS= --enable-shared \
-		--with-libs=${LOCALBASE}:${PREFIX}
-
-# expat is default unless WITH_XML is choosen
-.if !defined(WITHOUT_EXPAT) && !defined(WITH_XML)
-CONFIGURE_ARGS+= --with-expat
-LIB_DEPENDS+=	expat.6:${PORTSDIR}/textproc/expat2
-.endif
-
-.if defined(WITH_XML)
-CONFIGURE_ARGS+=--with-libxml2
-LIB_DEPENDS+=   xml2.5:${PORTSDIR}/textproc/libxml2
-.endif
-
-.ifndef WITHOUT_OPENSSL
-USE_OPENSSL=	yes
-CONFIGURE_ARGS+=--with-ssl
-.endif
-
-.if defined(WITHOUT_NLS)
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.else
-USE_GETTEXT=	yes
-PLIST_SUB+=	NLS=""
-.endif
-
-.if defined(WITHOUT_GSSAPI)
-CONFIGURE_ARGS+=--without-gssapi
-.endif
-
-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_get_request_flag.3 \
-	ne_get_session_flag.3 ne_set_request_flag.3 ne_set_session_flag.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 ne_set_connect_timeout.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}
-DOCSDIR=	${PREFIX}/share/doc/neon
-
-.include <bsd.port.pre.mk>
-
-pre-everything::
-.if defined(WITH_EXPAT) && defined(WITH_XML)
-	@${ECHO_CMD} "please choose between expat and libxml2 not both"
-	@${FALSE}
-.endif
-
-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)
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/www/neon28/distinfo b/www/neon28/distinfo
deleted file mode 100644
index e3e8c8652e1c..000000000000
--- a/www/neon28/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (neon-0.28.6.tar.gz) = 252578ed555552b71d15909641484951
-SHA256 (neon-0.28.6.tar.gz) = 06ee8b1aa37a14a956a1158bf6b5a8c3388976d61c1dc3773a3ffe18ac8ecc0e
-SIZE (neon-0.28.6.tar.gz) = 789193
diff --git a/www/neon28/files/patch-Makefile.in b/www/neon28/files/patch-Makefile.in
deleted file mode 100644
index b0ea71eb41a3..000000000000
--- a/www/neon28/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/neon28/files/patch-ltmain.sh b/www/neon28/files/patch-ltmain.sh
deleted file mode 100644
index ea2b374d0213..000000000000
--- a/www/neon28/files/patch-ltmain.sh
+++ /dev/null
@@ -1,15 +0,0 @@
---- ltmain.sh.orig	2009-02-25 17:14:36.000000000 +0300
-+++ ltmain.sh	2009-04-29 15:24:11.000000000 +0400
-@@ -2077,10 +2077,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /bin/false ; then
- 	func_basename "$file"
- 	name="$func_basename_result"
- 	instname="$dir/$name"i
- 	func_show_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/neon28/pkg-descr b/www/neon28/pkg-descr
deleted file mode 100644
index 3f8647c6bcf3..000000000000
--- a/www/neon28/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/neon28/pkg-plist b/www/neon28/pkg-plist
deleted file mode 100644
index 2cb90629dc14..000000000000
--- a/www/neon28/pkg-plist
+++ /dev/null
@@ -1,86 +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
-include/neon/ne_pkcs11.h
-lib/libneon.so.28
-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/pl/LC_MESSAGES/neon.mo
-%%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
-%%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/refreqflags.html
-%%PORTDOCS%%%%DOCSDIR%%/html/refsessflags.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%%@dirrm %%DOCSDIR%%/html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm include/neon
diff --git a/www/neon29/Makefile b/www/neon29/Makefile
index 4ea7d57f2aa6..413c3c4ac3de 100644
--- a/www/neon29/Makefile
+++ b/www/neon29/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	neon29
 PORTVERSION=	0.29.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://www.webdav.org/neon/
 DISTNAME=	neon-${PORTVERSION}
@@ -20,7 +20,7 @@ CONFLICTS=	neon2[6|8]-[0-9]*
 USE_AUTOTOOLS=	libtool:22
 USE_LDCONFIG=	yes
 
-USE_GNOME=	gnomehack gnometarget
+USE_GNOME=	gnomehack ltverhack
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared \
 		--with-libs=${LOCALBASE}:${PREFIX}
diff --git a/www/neon29/pkg-plist b/www/neon29/pkg-plist
index a640c8e6801c..78e7c324db1e 100644
--- a/www/neon29/pkg-plist
+++ b/www/neon29/pkg-plist
@@ -23,7 +23,7 @@ include/neon/ne_utils.h
 include/neon/ne_xml.h
 include/neon/ne_xmlreq.h
 include/neon/ne_pkcs11.h
-lib/libneon.so.29
+lib/libneon.so.27
 lib/libneon.so
 lib/libneon.la
 lib/libneon.a
diff --git a/www/neonpp/Makefile b/www/neonpp/Makefile
deleted file mode 100644
index 131ed9aa7367..000000000000
--- a/www/neonpp/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# New ports collection makefile for:	neonpp
-# Date created:				2006-10-06
-# Whom:					Roman Bogorodskiy <novel@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	neonpp
-PORTVERSION=	0.3
-PORTREVISION=	1
-CATEGORIES=	www
-MASTER_SITES=	http://files.backtrace.info/releases/neonpp/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	novel
-
-MAINTAINER=	novel@FreeBSD.org
-COMMENT=	C++ wrapper library for neon
-
-LIB_DEPENDS=	sigc-2.0.0:${PORTSDIR}/devel/libsigc++20 \
-		neon.28:${PORTSDIR}/www/neon28
-
-USE_LDCONFIG=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--with-pkgconfig-dir=${PREFIX}/libdata/pkgconfig
-
-BROKEN=		fails to build with new www/neon28
-
-.include <bsd.port.mk>
diff --git a/www/neonpp/distinfo b/www/neonpp/distinfo
deleted file mode 100644
index 7cb14da25047..000000000000
--- a/www/neonpp/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (neonpp-0.3.tar.gz) = 4b91231886397814acb4342fc15bddc4
-SHA256 (neonpp-0.3.tar.gz) = 3748d30fce3947522e2f2dfa25488f20a22af237cb7dafb129756fbd7e34db72
-SIZE (neonpp-0.3.tar.gz) = 319189
diff --git a/www/neonpp/pkg-descr b/www/neonpp/pkg-descr
deleted file mode 100644
index 9dee8f7fecc2..000000000000
--- a/www/neonpp/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Neon++ is a C++ wrapper library for neon.
-
-WWW:	http://projects.backtrace.info/pmwiki.php?n=Main.Neon
diff --git a/www/neonpp/pkg-plist b/www/neonpp/pkg-plist
deleted file mode 100644
index 05518b6fc9d9..000000000000
--- a/www/neonpp/pkg-plist
+++ /dev/null
@@ -1,10 +0,0 @@
-@comment $FreeBSD$
-include/neon++-1.0/neon++/session.hh
-include/neon++-1.0/neon++/request.hh
-include/neon++-1.0/neon++/neonpp-exception.hh
-lib/libneonpp.so.0
-lib/libneonpp.so
-lib/libneonpp.la
-libdata/pkgconfig/libneon++.pc
-@dirrmtry include/neon++-1.0/neon++
-@dirrmtry include/neon++-1.0
diff --git a/www/sitecopy/Makefile b/www/sitecopy/Makefile
index 7570a20043cb..08cc3899ef80 100644
--- a/www/sitecopy/Makefile
+++ b/www/sitecopy/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sitecopy
 PORTVERSION=	0.16.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://www.manyfish.co.uk/${PORTNAME}/ \
 		${MASTER_SITE_GENTOO}
@@ -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.28:${PORTSDIR}/www/neon28
+LIB_DEPENDS=	neon.27:${PORTSDIR}/www/neon29
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CC="${CC} -I${LOCALBASE}/include" \
@@ -36,5 +36,7 @@ MAN1=		sitecopy.1
 post-patch:
 	@${REINPLACE_CMD} -e 's|;;|;|g' \
 		${WRKSRC}/src/sitestore.c
+	@${REINPLACE_CMD} -e 's|25 26 27 28|25 26 27 28 29|g' \
+		${WRKSRC}/configure
 
 .include <bsd.port.mk>
author	Jeremy Messenger <mezz@FreeBSD.org>	2010-07-30 22:14:49 +0000
committer	Jeremy Messenger <mezz@FreeBSD.org>	2010-07-30 22:14:49 +0000
commit	113641e728e938d480f5c33ddd6a1ad6b06c2ab7 (patch)
tree	13d8a1389a6f4c52c2e1d9583ff1313b5292a6bb
parent	7bb5db52e1a44398d3bc9df3190bdfa7fc4375ec (diff)
download	ports-113641e728e938d480f5c33ddd6a1ad6b06c2ab7.tar.gz ports-113641e728e938d480f5c33ddd6a1ad6b06c2ab7.zip