aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--MOVED1
-rw-r--r--UPDATING14
-rw-r--r--audio/libcoverart/Makefile4
-rw-r--r--audio/libmusicbrainz3/Makefile4
-rw-r--r--audio/libmusicbrainz5/Makefile3
-rw-r--r--deskutils/libopensync-plugin-sunbird/Makefile4
-rw-r--r--deskutils/mirall/Makefile3
-rw-r--r--devel/anjuta/Makefile4
-rw-r--r--devel/php5-dav/Makefile3
-rw-r--r--devel/pysvn/Makefile3
-rw-r--r--devel/subversion16/Makefile.common4
-rw-r--r--devel/subversion17/Makefile.common4
-rw-r--r--editors/libreoffice/Makefile4
-rw-r--r--games/live-f1/Makefile4
-rw-r--r--multimedia/audacious-plugins/Makefile4
-rw-r--r--multimedia/gstreamer-plugins/Makefile2
-rw-r--r--multimedia/gstreamer-plugins/Makefile.common2
-rw-r--r--multimedia/gstreamer1-plugins/Makefile2
-rw-r--r--multimedia/gstreamer1-plugins/Makefile.common2
-rw-r--r--net/asterisk/Makefile4
-rw-r--r--net/asterisk11/Makefile4
-rw-r--r--net/asterisk13/Makefile3
-rw-r--r--net/owncloud-csync/Makefile4
-rw-r--r--sysutils/nut/Makefile4
-rw-r--r--sysutils/pecl-mogilefs/Makefile3
-rw-r--r--www/Makefile2
-rw-r--r--www/cadaver/Makefile4
-rw-r--r--www/neon/Makefile (renamed from www/neon29/Makefile)6
-rw-r--r--www/neon/distinfo2
-rw-r--r--www/neon/pkg-descr (renamed from www/neon29/pkg-descr)0
-rw-r--r--www/neon/pkg-plist (renamed from www/neon29/pkg-plist)7
-rw-r--r--www/neon29/distinfo2
-rw-r--r--www/sitecopy/Makefile4
33 files changed, 71 insertions, 49 deletions
diff --git a/MOVED b/MOVED
index 77c8b041c3b9..6a8b80d3500b 100644
--- a/MOVED
+++ b/MOVED
@@ -7329,3 +7329,4 @@ x11/nvidia-driver-71||2014-12-19|Removed: Not compatible with xserver 1.14
x11/nvidia-driver-96||2014-12-19|Removed: Not compatible with xserver 1.14
www/drupal7-jailadmin||2014-12-20|Removed per author's request; unmaintained
www/drupal7-vulnscan||2014-12-20|Removed per author's request; unmaintained
+www/neon29|www/neon|2014-12-24|Rename to reflect upstream
diff --git a/UPDATING b/UPDATING
index 88fadd02bd55..ffca5a63552b 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,20 @@ 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.
+
+20141224:
+ AFFECTS: users of lang/neon29
+ AUTHOR: ohauer@FreeBSD.org
+
+ The port www/neon29 was renamed to www/neon and updated to version 0.30.1
+
+ If you use pkg, simply upgrade:
+ # pkg upgrade
+
+ If you use portmaster, rebuild ports dependding on neon
+ # portmaster -o www/neon www/neon29
+ # portmaster -R -r neon
+
20141219:
AFFECTS: users of x11/xorg and all xorg ports
AUTHOR: dumbbell@FreeBSD.org
diff --git a/audio/libcoverart/Makefile b/audio/libcoverart/Makefile
index 13998cdfabc2..b250de20053c 100644
--- a/audio/libcoverart/Makefile
+++ b/audio/libcoverart/Makefile
@@ -2,7 +2,7 @@
PORTNAME= libcoverart
PORTVERSION= 1.0.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= audio
MASTER_SITES= https://cloud.github.com/downloads/metabrainz/${PORTNAME}/
@@ -12,7 +12,7 @@ COMMENT= Library for accessing the MusicBrainz cover art archive
LICENSE= LGPL20
LIB_DEPENDS= libjansson.so:${PORTSDIR}/devel/jansson \
- libneon.so:${PORTSDIR}/www/neon29
+ libneon.so:${PORTSDIR}/www/neon
USES= cmake
USE_LDCONFIG= yes
diff --git a/audio/libmusicbrainz3/Makefile b/audio/libmusicbrainz3/Makefile
index 32d22cbc8827..43720adb7ba1 100644
--- a/audio/libmusicbrainz3/Makefile
+++ b/audio/libmusicbrainz3/Makefile
@@ -2,7 +2,7 @@
PORTNAME= libmusicbrainz
PORTVERSION= 3.0.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= audio
MASTER_SITES= ftp://ftp.musicbrainz.org/pub/musicbrainz/ \
http://ftp.osuosl.org/pub/musicbrainz/
@@ -14,7 +14,7 @@ COMMENT= MusicBrainz client library for audio metadata lookup
LICENSE= LGPL21
LIB_DEPENDS= libdiscid.so:${PORTSDIR}/audio/libdiscid \
- libneon.so:${PORTSDIR}/www/neon29
+ libneon.so:${PORTSDIR}/www/neon
USES= cmake
USE_LDCONFIG= yes
diff --git a/audio/libmusicbrainz5/Makefile b/audio/libmusicbrainz5/Makefile
index 9ca9f4cda044..0b86fd185351 100644
--- a/audio/libmusicbrainz5/Makefile
+++ b/audio/libmusicbrainz5/Makefile
@@ -2,6 +2,7 @@
PORTNAME= libmusicbrainz
PORTVERSION= 5.0.1
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= https://cloud.github.com/downloads/metabrainz/${PORTNAME}/
PKGNAMESUFFIX= 5
@@ -11,7 +12,7 @@ COMMENT= MusicBrainz client library for audio metadata lookup
LICENSE= LGPL21
-LIB_DEPENDS= libneon.so:${PORTSDIR}/www/neon29
+LIB_DEPENDS= libneon.so:${PORTSDIR}/www/neon
USES= cmake
USE_LDCONFIG= yes
diff --git a/deskutils/libopensync-plugin-sunbird/Makefile b/deskutils/libopensync-plugin-sunbird/Makefile
index 0eb877d9d923..c19e4b61e4fe 100644
--- a/deskutils/libopensync-plugin-sunbird/Makefile
+++ b/deskutils/libopensync-plugin-sunbird/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libopensync-plugin-sunbird
PORTVERSION= 0.22
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= deskutils
MASTER_SITES= http://www.opensync.org/download/releases/${PORTVERSION}/
@@ -11,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Sunbird plugin for the OpenSync framework
LIB_DEPENDS= libopensync.so:${PORTSDIR}/devel/libopensync022 \
- libneon.so:${PORTSDIR}/www/neon29
+ libneon.so:${PORTSDIR}/www/neon
USES= libtool pkgconfig tar:bzip2
GNU_CONFIGURE= yes
diff --git a/deskutils/mirall/Makefile b/deskutils/mirall/Makefile
index 2e0b24d8dab9..1b7c56a1228c 100644
--- a/deskutils/mirall/Makefile
+++ b/deskutils/mirall/Makefile
@@ -3,6 +3,7 @@
PORTNAME= mirall
PORTVERSION= 1.6.3
+PORTREVISION= 1
CATEGORIES= deskutils
MASTER_SITES= http://download.owncloud.com/desktop/stable/
@@ -13,7 +14,7 @@ LICENSE= GPLv2
LIB_DEPENDS= libinotify.so:${PORTSDIR}/devel/libinotify \
libqtkeychain.so:${PORTSDIR}/security/qtkeychain \
- libneon.so:${PORTSDIR}/www/neon29
+ libneon.so:${PORTSDIR}/www/neon
USES= cmake:outsource compiler:c++11-lang gmake pkgconfig tar:bzip2
USE_QT4= corelib dbus gui network qtestlib webkit xml \
diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile
index 8e558b9fafad..9dcc812aef64 100644
--- a/devel/anjuta/Makefile
+++ b/devel/anjuta/Makefile
@@ -4,7 +4,7 @@
PORTNAME= anjuta
PORTVERSION= 2.32.1.1
-PORTREVISION= 14
+PORTREVISION= 15
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -72,7 +72,7 @@ DEVHELP_DESC= Devhelp support
.if ${PORT_OPTIONS:MSVN}
BUILD_DEPENDS+= svn:${PORTSDIR}/devel/subversion
LIB_DEPENDS+= libapr-1.so:${PORTSDIR}/devel/apr1
-LIB_DEPENDS+= libneon.so:${PORTSDIR}/www/neon29
+LIB_DEPENDS+= libneon.so:${PORTSDIR}/www/neon
RUN_DEPENDS+= svn:${PORTSDIR}/devel/subversion
PLIST_SUB+= SVN=""
.else
diff --git a/devel/php5-dav/Makefile b/devel/php5-dav/Makefile
index 36a9c94e0f14..1432d8c53697 100644
--- a/devel/php5-dav/Makefile
+++ b/devel/php5-dav/Makefile
@@ -3,6 +3,7 @@
PORTNAME= dav
PORTVERSION= 1.2
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://download.pureftpd.org/php-webdav/
PKGNAMEPREFIX= php5-
@@ -13,7 +14,7 @@ COMMENT= The PHP WebDAV extension
LICENSE= ISCL
-LIB_DEPENDS= libneon.so:${PORTSDIR}/www/neon29
+LIB_DEPENDS= libneon.so:${PORTSDIR}/www/neon
USE_PHP= yes
USE_PHPIZE= yes
diff --git a/devel/pysvn/Makefile b/devel/pysvn/Makefile
index b87edc697888..c86cf5a85b22 100644
--- a/devel/pysvn/Makefile
+++ b/devel/pysvn/Makefile
@@ -3,6 +3,7 @@
PORTNAME= pysvn
PORTVERSION= 1.7.8
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://pysvn.barrys-emacs.org/source_kits/
@@ -12,7 +13,7 @@ COMMENT= Python binding for Subversion
LICENSE= APACHE20
LIB_DEPENDS= libsvn_client-1.so:${PORTSDIR}/devel/subversion \
- libneon.so:${PORTSDIR}/www/neon29
+ libneon.so:${PORTSDIR}/www/neon
# Python3 ready
USES= python
diff --git a/devel/subversion16/Makefile.common b/devel/subversion16/Makefile.common
index edb7d64aa6a2..4c72e3da8113 100644
--- a/devel/subversion16/Makefile.common
+++ b/devel/subversion16/Makefile.common
@@ -3,7 +3,7 @@
PORTNAME= subversion
PORTVERSION= #please edit Makefile.inc for PORTVERSION, so ../svnmerge can stay in sync.
-PORTREVISION?= 8
+PORTREVISION?= 9
CATEGORIES+= devel
PKGNAMESUFFIX= 16
MASTER_SITES= http://subversion.tigris.org/downloads/
@@ -60,7 +60,7 @@ MOD_DAV_SVN_USE= APACHE=22+
NEON_CONFIGURE_OFF= --without-neon
NEON_CONFIGURE_ON= --with-neon=${LOCALBASE}
-NEON_LIB_DEPENDS= libneon.so:${PORTSDIR}/www/neon29
+NEON_LIB_DEPENDS= libneon.so:${PORTSDIR}/www/neon
NLS_CONFIGURE_OFF= --disable-nls
NLS_USES= gettext
diff --git a/devel/subversion17/Makefile.common b/devel/subversion17/Makefile.common
index bc7a7a976f76..fc507388895b 100644
--- a/devel/subversion17/Makefile.common
+++ b/devel/subversion17/Makefile.common
@@ -3,7 +3,7 @@
PORTNAME= subversion
PORTVERSION= 1.7.19
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES+= devel
MASTER_SITES= ${MASTER_SITE_APACHE}
DIST_SUBDIR= subversion17
@@ -59,7 +59,7 @@ MOD_DAV_SVN_USE= APACHE=22+
NEON_CONFIGURE_OFF= --without-neon
NEON_CONFIGURE_ON= --with-neon=${LOCALBASE}
-NEON_LIB_DEPENDS= libneon.so:${PORTSDIR}/www/neon29
+NEON_LIB_DEPENDS= libneon.so:${PORTSDIR}/www/neon
NLS_CONFIGURE_OFF= --disable-nls
NLS_USES= gettext
diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile
index 15bb5fd5ab82..c8276998a874 100644
--- a/editors/libreoffice/Makefile
+++ b/editors/libreoffice/Makefile
@@ -2,7 +2,7 @@
.include "${.CURDIR}/Makefile.common"
-PORTREVISION= 0
+PORTREVISION= 1
COMMENT= Full integrated office productivity suite
@@ -279,7 +279,7 @@ SYSTRAY_CONFIGURE_ENABLE= systray
TEST_CONFIGURE_ENABLE= cve-tests
-WEBDAV_LIB_DEPENDS= libneon.so:${PORTSDIR}/www/neon29
+WEBDAV_LIB_DEPENDS= libneon.so:${PORTSDIR}/www/neon
WEBDAV_CONFIGURE_ENABLE= neon
.include <bsd.port.options.mk>
diff --git a/games/live-f1/Makefile b/games/live-f1/Makefile
index f2d0e75c43d3..b7e80cc6d704 100644
--- a/games/live-f1/Makefile
+++ b/games/live-f1/Makefile
@@ -3,7 +3,7 @@
PORTNAME= live-f1
PORTVERSION= 0.2.11
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= https://launchpad.net/${PORTNAME}/${PORTVERSION:R}/${PORTVERSION}/+download/
@@ -12,7 +12,7 @@ COMMENT= Native client for the official Formula 1 Live Timing service
LICENSE= GPLv2
-LIB_DEPENDS= libneon.so:${PORTSDIR}/www/neon29
+LIB_DEPENDS= libneon.so:${PORTSDIR}/www/neon
WRKSRC= ${WRKDIR}/${PORTNAME}_${PORTVERSION}
diff --git a/multimedia/audacious-plugins/Makefile b/multimedia/audacious-plugins/Makefile
index 272bfbabcfd6..9284a5904f5b 100644
--- a/multimedia/audacious-plugins/Makefile
+++ b/multimedia/audacious-plugins/Makefile
@@ -3,7 +3,7 @@
PORTNAME= audacious-plugins
PORTVERSION= 3.5
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= multimedia audio
MASTER_SITES= http://distfiles.audacious-media-player.org/
@@ -262,7 +262,7 @@ PLIST_SUB+= CDAUDIOPLUGIN="@comment "
.endif
.if ${PORT_OPTIONS:MNEON}
-LIB_DEPENDS+= libneon.so:${PORTSDIR}/www/neon29
+LIB_DEPENDS+= libneon.so:${PORTSDIR}/www/neon
CONFIGURE_ARGS+=--enable-neon
PLIST_SUB+= NEONPLUGIN=""
.else
diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile
index d0c3c340cdfa..cd8675ced941 100644
--- a/multimedia/gstreamer-plugins/Makefile
+++ b/multimedia/gstreamer-plugins/Makefile
@@ -6,7 +6,7 @@ PORTNAME= gstreamer
PORTVERSION?= ${BASE_PORTVERSION}
# When chasing a shared library for a plug-in bump the PORTREVISION in the
# plug-in port instead, like ${category}/gstreamer-plugin-${PLUGIN}.
-PORTREVISION?= 4
+PORTREVISION?= 5
PORTEPOCH= 3
CATEGORIES?= multimedia audio
MASTER_SITES= http://gstreamer.freedesktop.org/src/gst-plugins-base/:base \
diff --git a/multimedia/gstreamer-plugins/Makefile.common b/multimedia/gstreamer-plugins/Makefile.common
index ed53d12d9312..6df4bfe5d4cd 100644
--- a/multimedia/gstreamer-plugins/Makefile.common
+++ b/multimedia/gstreamer-plugins/Makefile.common
@@ -415,7 +415,7 @@ gst_nas_PLIST_FILES= ${GST_LIB_DIR}/libgstnassink.la \
${GST_LIB_DIR}/libgstnassink.so
# neon
-gst_neon_LIB_DEPENDS+= libneon.so:${PORTSDIR}/www/neon29
+gst_neon_LIB_DEPENDS+= libneon.so:${PORTSDIR}/www/neon
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/multimedia/gstreamer1-plugins/Makefile b/multimedia/gstreamer1-plugins/Makefile
index e2c9c5538bcd..edb629837684 100644
--- a/multimedia/gstreamer1-plugins/Makefile
+++ b/multimedia/gstreamer1-plugins/Makefile
@@ -6,7 +6,7 @@ PORTNAME= gstreamer
PORTVERSION?= ${BASE_PORTVERSION}
# When chasing a shared library for a plug-in bump the PORTREVISION in the
# plug-in port instead, like ${category}/gstreamer1-plugin-${PLUGIN}.
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES?= multimedia audio
MASTER_SITES= http://gstreamer.freedesktop.org/src/gst-plugins-base/:base \
http://gstreamer.freedesktop.org/src/gst-plugins-bad/:bad \
diff --git a/multimedia/gstreamer1-plugins/Makefile.common b/multimedia/gstreamer1-plugins/Makefile.common
index 4be897b0dd24..b8b9d5078a77 100644
--- a/multimedia/gstreamer1-plugins/Makefile.common
+++ b/multimedia/gstreamer1-plugins/Makefile.common
@@ -307,7 +307,7 @@ gst_mpeg2enc_LIB_DEPENDS= libmjpegutils.so:${PORTSDIR}/multimedia/mjpegtools
gst_mpeg2dec_LIB_DEPENDS= libmpeg2.so:${PORTSDIR}/multimedia/libmpeg2
# neon
-gst_neon_LIB_DEPENDS+= libneon.so:${PORTSDIR}/www/neon29
+gst_neon_LIB_DEPENDS+= libneon.so:${PORTSDIR}/www/neon
gst_neon_PLIST_FILES= ${GST_LIB_DIR}/libgstneonhttpsrc.so
# ogg
diff --git a/net/asterisk/Makefile b/net/asterisk/Makefile
index fc89d18c00d9..1b84a867365d 100644
--- a/net/asterisk/Makefile
+++ b/net/asterisk/Makefile
@@ -3,7 +3,7 @@
PORTNAME= asterisk
PORTVERSION= 1.8.32.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net
MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \
http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/
@@ -107,7 +107,7 @@ CURL_LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl
SPANDSP_CONFIGURE_WITH= spandsp
SPANDSP_LIB_DEPENDS= libspandsp.so:${PORTSDIR}/comms/spandsp
EXCHANGE_CONFIGURE_OFF= --without-neon --without-neon29
-EXCHANGE_LIB_DEPENDS= libneon.so:${PORTSDIR}/www/neon29
+EXCHANGE_LIB_DEPENDS= libneon.so:${PORTSDIR}/www/neon
SRTP_CONFIGURE_WITH= srtp
SRTP_BUILD_DEPENDS= libsrtp>=1.4.4:${PORTSDIR}/net/libsrtp
LUA_CONFIGURE_WITH= lua
diff --git a/net/asterisk11/Makefile b/net/asterisk11/Makefile
index b1d2bce8efd3..ea074861734f 100644
--- a/net/asterisk11/Makefile
+++ b/net/asterisk11/Makefile
@@ -2,7 +2,7 @@
PORTNAME= asterisk
PORTVERSION= 11.15.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \
http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/
@@ -100,7 +100,7 @@ CURL_LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl
SPANDSP_CONFIGURE_WITH= spandsp
SPANDSP_LIB_DEPENDS= libspandsp.so:${PORTSDIR}/comms/spandsp
EXCHANGE_CONFIGURE_OFF= --without-neon --without-neon29
-EXCHANGE_LIB_DEPENDS= libneon.so:${PORTSDIR}/www/neon29
+EXCHANGE_LIB_DEPENDS= libneon.so:${PORTSDIR}/www/neon
SRTP_CONFIGURE_WITH= srtp
SRTP_BUILD_DEPENDS= libsrtp>=1.4.4:${PORTSDIR}/net/libsrtp
LUA_CONFIGURE_WITH= lua
diff --git a/net/asterisk13/Makefile b/net/asterisk13/Makefile
index fbca14b43a02..fbe67cd5e21d 100644
--- a/net/asterisk13/Makefile
+++ b/net/asterisk13/Makefile
@@ -2,6 +2,7 @@
PORTNAME= asterisk
PORTVERSION= 13.1.0
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \
http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/
@@ -102,7 +103,7 @@ CURL_LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl
SPANDSP_CONFIGURE_WITH= spandsp
SPANDSP_LIB_DEPENDS= libspandsp.so:${PORTSDIR}/comms/spandsp
EXCHANGE_CONFIGURE_OFF= --without-neon --without-neon29
-EXCHANGE_LIB_DEPENDS= libneon.so:${PORTSDIR}/www/neon29
+EXCHANGE_LIB_DEPENDS= libneon.so:${PORTSDIR}/www/neon
SRTP_CONFIGURE_WITH= srtp
SRTP_BUILD_DEPENDS= libsrtp>=1.4.4:${PORTSDIR}/net/libsrtp
LUA_CONFIGURE_WITH= lua
diff --git a/net/owncloud-csync/Makefile b/net/owncloud-csync/Makefile
index fae69d93ed5c..2eabcbf7c39a 100644
--- a/net/owncloud-csync/Makefile
+++ b/net/owncloud-csync/Makefile
@@ -3,7 +3,7 @@
PORTNAME= owncloud-csync
PORTVERSION= 0.91.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net kde
MASTER_SITES= http://download.owncloud.com/desktop/stable/
DISTNAME= ocsync-${PORTVERSION}
@@ -16,7 +16,7 @@ LICENSE= GPLv2
LIB_DEPENDS= libiniparser.so:${PORTSDIR}/devel/iniparser \
libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient \
libssh.so.4:${PORTSDIR}/security/libssh \
- libneon.so:${PORTSDIR}/www/neon29
+ libneon.so:${PORTSDIR}/www/neon
USES= cmake:outsource iconv pkgconfig tar:bzip2
USE_SQLITE= yes
diff --git a/sysutils/nut/Makefile b/sysutils/nut/Makefile
index f0823fce0418..7b1f2f610170 100644
--- a/sysutils/nut/Makefile
+++ b/sysutils/nut/Makefile
@@ -3,7 +3,7 @@
PORTNAME= nut
PORTVERSION= 2.7.2
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= sysutils
MASTER_SITES= http://www.networkupstools.org/source/${PORTVERSION:R}/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.sig
@@ -105,7 +105,7 @@ PLIST_SUB+= NUT_SNMP="@comment "
.endif
.if ${PORT_OPTIONS:MNEON}
-LIB_DEPENDS+= libneon.so:${PORTSDIR}/www/neon29
+LIB_DEPENDS+= libneon.so:${PORTSDIR}/www/neon
CONFIGURE_ARGS+= --with-neonxml
PLIST_SUB+= NUT_NEON=""
.else
diff --git a/sysutils/pecl-mogilefs/Makefile b/sysutils/pecl-mogilefs/Makefile
index ac6d3b22def1..18e698555ab3 100644
--- a/sysutils/pecl-mogilefs/Makefile
+++ b/sysutils/pecl-mogilefs/Makefile
@@ -3,6 +3,7 @@
PORTNAME= mogilefs
PORTVERSION= 0.9.2
+PORTREVISION= 1
CATEGORIES= sysutils pear
MASTER_SITES= http://pecl.php.net/get/
PKGNAMEPREFIX= pecl-
@@ -13,7 +14,7 @@ COMMENT= PHP client library to communicate with the MogileFS storage
LICENSE= BSD
-LIB_DEPENDS= libneon.so:${PORTSDIR}/www/neon29
+LIB_DEPENDS= libneon.so:${PORTSDIR}/www/neon
USE_PHP= yes
USE_PHP_BUILD= spl
diff --git a/www/Makefile b/www/Makefile
index 0f058f16b817..555ca892d05a 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -527,7 +527,7 @@
SUBDIR += mythplugin-mythweb
SUBDIR += nanoblogger
SUBDIR += nanoblogger-extra
- SUBDIR += neon29
+ SUBDIR += neon
SUBDIR += netoffice
SUBDIR += netrik
SUBDIR += netstiff
diff --git a/www/cadaver/Makefile b/www/cadaver/Makefile
index da98e5290284..69a7a5d5f216 100644
--- a/www/cadaver/Makefile
+++ b/www/cadaver/Makefile
@@ -3,7 +3,7 @@
PORTNAME= cadaver
PORTVERSION= 0.23.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www
MASTER_SITES= http://www.webdav.org/cadaver/ \
http://www.tcbug.org/
@@ -11,7 +11,7 @@ MASTER_SITES= http://www.webdav.org/cadaver/ \
MAINTAINER= jpaetzel@FreeBSD.org
COMMENT= Commandline client for DAV
-LIB_DEPENDS= libneon.so:${PORTSDIR}/www/neon29
+LIB_DEPENDS= libneon.so:${PORTSDIR}/www/neon
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-netrc
diff --git a/www/neon29/Makefile b/www/neon/Makefile
index ab63d04b672f..6f5f6a662748 100644
--- a/www/neon29/Makefile
+++ b/www/neon/Makefile
@@ -1,12 +1,10 @@
# Created by: Mikhail Teterin <mi@aldan.algebra.com>
# $FreeBSD$
-PORTNAME= neon29
-PORTVERSION= 0.29.6
-PORTREVISION= 7
+PORTNAME= neon
+PORTVERSION= 0.30.1
CATEGORIES= www
MASTER_SITES= http://www.webdav.org/neon/
-DISTNAME= neon-${PORTVERSION}
MAINTAINER= lev@FreeBSD.org
COMMENT= HTTP and WebDAV client library for Unix systems
diff --git a/www/neon/distinfo b/www/neon/distinfo
new file mode 100644
index 000000000000..54d6b7caccd6
--- /dev/null
+++ b/www/neon/distinfo
@@ -0,0 +1,2 @@
+SHA256 (neon-0.30.1.tar.gz) = 00c626c0dc18d094ab374dbd9a354915bfe4776433289386ed489c2ec0845cdd
+SIZE (neon-0.30.1.tar.gz) = 911414
diff --git a/www/neon29/pkg-descr b/www/neon/pkg-descr
index 3f8647c6bcf3..3f8647c6bcf3 100644
--- a/www/neon29/pkg-descr
+++ b/www/neon/pkg-descr
diff --git a/www/neon29/pkg-plist b/www/neon/pkg-plist
index f78251fba767..3191d996c824 100644
--- a/www/neon29/pkg-plist
+++ b/www/neon/pkg-plist
@@ -26,7 +26,7 @@ include/neon/ne_xmlreq.h
lib/libneon.a
lib/libneon.so
lib/libneon.so.27
-lib/libneon.so.27.2.6
+lib/libneon.so.27.3.1
libdata/pkgconfig/neon.pc
man/man1/neon-config.1.gz
man/man3/ne_add_request_header.3.gz
@@ -79,13 +79,15 @@ man/man3/ne_response_header_iterate.3.gz
man/man3/ne_session_create.3.gz
man/man3/ne_session_destroy.3.gz
man/man3/ne_session_proxy.3.gz
+man/man3/ne_session_socks_proxy.3.gz
+man/man3/ne_session_system_proxy.3.gz
+man/man3/ne_set_addrlist.3.gz
man/man3/ne_set_connect_timeout.3.gz
man/man3/ne_set_error.3.gz
man/man3/ne_set_proxy_auth.3.gz
man/man3/ne_set_read_timeout.3.gz
man/man3/ne_set_request_body_buffer.3.gz
man/man3/ne_set_request_body_fd.3.gz
-man/man3/ne_set_request_body_fd64.3.gz
man/man3/ne_set_request_flag.3.gz
man/man3/ne_set_server_auth.3.gz
man/man3/ne_set_session_flag.3.gz
@@ -147,6 +149,7 @@ man/man3/neon.3.gz
%%PORTDOCS%%%%DOCSDIR%%/html/refiaddr.html
%%PORTDOCS%%%%DOCSDIR%%/html/refneon.html
%%PORTDOCS%%%%DOCSDIR%%/html/refopts.html
+%%PORTDOCS%%%%DOCSDIR%%/html/refproxy.html
%%PORTDOCS%%%%DOCSDIR%%/html/refreq.html
%%PORTDOCS%%%%DOCSDIR%%/html/refreqbody.html
%%PORTDOCS%%%%DOCSDIR%%/html/refreqflags.html
diff --git a/www/neon29/distinfo b/www/neon29/distinfo
deleted file mode 100644
index 1f47c5307d92..000000000000
--- a/www/neon29/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (neon-0.29.6.tar.gz) = 9c640b728d6dc80ef1e48f83181166ab6bc95309cece5537e01ffdd01b96eb43
-SIZE (neon-0.29.6.tar.gz) = 882267
diff --git a/www/sitecopy/Makefile b/www/sitecopy/Makefile
index 5cc6c98ea020..1cecc32d88e5 100644
--- a/www/sitecopy/Makefile
+++ b/www/sitecopy/Makefile
@@ -3,7 +3,7 @@
PORTNAME= sitecopy
PORTVERSION= 0.16.6
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= www
MASTER_SITES= http://www.manyfish.co.uk/${PORTNAME}/ \
${MASTER_SITE_GENTOO}
@@ -12,7 +12,7 @@ MASTER_SITE_SUBDIR= distfiles
MAINTAINER= sitecopy@oldach.net
COMMENT= Maintains remote websites, uses FTP or WebDAV to sync up w/ local copy
-LIB_DEPENDS= libneon.so:${PORTSDIR}/www/neon29
+LIB_DEPENDS= libneon.so:${PORTSDIR}/www/neon
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include