8 files changed, 17 insertions, 10 deletions

diff --git a/MOVED b/MOVED
index 5037c51121d9..c69cef637ff7 100644
--- a/MOVED
+++ b/MOVED
@@ -4382,3 +4382,4 @@ emulators/linux-xjoypad||2013-06-05|Removed: depend on expired devel/linux-js, c
 lang/elisp-manual||2013-06-05|Has expired: Broken for more than 6 months
 sysutils/sge62||2013-06-05|Has expired: Ancient and unsupported release
 x11-toolkits/ruby-wx||2013-06-07|Has expired: Does not work with Ruby 1.9
+sysutils/userspace-rcu|sysutils/liburcu|2013-06-07|Renamed correctly according to upstream
diff --git a/dns/knot/Makefile b/dns/knot/Makefile
index 685d5189807f..d6f461c75f37 100644
--- a/dns/knot/Makefile
+++ b/dns/knot/Makefile
@@ -14,7 +14,7 @@ LICENSE=	GPLv3
 
 BUILD_DEPENDS=	bison:${PORTSDIR}/devel/bison \
 		flex>=2.5.35_1:${PORTSDIR}/textproc/flex
-LIB_DEPENDS=	urcu:${PORTSDIR}/sysutils/userspace-rcu
+LIB_DEPENDS=	urcu:${PORTSDIR}/sysutils/liburcu
 
 CONFIGURE_ARGS=	--sysconfdir=${ETCDIR}
 GNU_CONFIGURE=	yes
diff --git a/sysutils/Makefile b/sysutils/Makefile
index f54b878d3cd0..628821e8484f 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -473,6 +473,7 @@
     SUBDIR += libretto-config
     SUBDIR += libsunacl
     SUBDIR += libumberlog
+    SUBDIR += liburcu
     SUBDIR += libutempter
     SUBDIR += libzeitgeist
     SUBDIR += lineak-defaultplugin
@@ -981,7 +982,6 @@
     SUBDIR += usermin
     SUBDIR += userneu
     SUBDIR += userneu-devel
-    SUBDIR += userspace-rcu
     SUBDIR += usrinfo
     SUBDIR += utcount
     SUBDIR += vbetool
diff --git a/sysutils/userspace-rcu/Makefile b/sysutils/liburcu/Makefile
index 74728409a6ed..ce533fd8ce01 100644
--- a/sysutils/userspace-rcu/Makefile
+++ b/sysutils/liburcu/Makefile
@@ -1,25 +1,31 @@
 # Created by: Leo Vandewoestijne <freebsd@dns-lab.com>
 # $FreeBSD$
 
-PORTNAME=	userspace-rcu
-PORTVERSION=	0.7.5
+PORTNAME=	liburcu
+PORTVERSION=	0.7.6
 CATEGORIES=	sysutils
 MASTER_SITES=	http://lttng.org/files/urcu/
+DISTNAME=	userspace-rcu-${PORTVERSION}
 
 MAINTAINER=	freebsd@dns-lab.com
-COMMENT=	A read-copy-update data synchronization library
+COMMENT=	Userspace read-copy-update (RCU) data synchronization library
 
 LICENSE=	LGPL21
 
 PORTDOCS=	ChangeLog README cds-api.txt rcu-api.txt uatomic-api.txt
 
+USES=		pathfix
 USE_BZIP2=	yes
-GNU_CONFIGURE=	yes
-USES=	pathfix
 USE_LDCONFIG=	yes
+GNU_CONFIGURE=	yes
+
+CONFIGURE_ARGS+=	--docdir=${DOCSDIR}
 
 .if defined(.PARSEDIR)
 USE_GMAKE=	yes
 .endif
 
+regression-test: build
+	@cd ${WRKSRC} && ${MAKE} check
+
 .include <bsd.port.mk>
diff --git a/sysutils/liburcu/distinfo b/sysutils/liburcu/distinfo
new file mode 100644
index 000000000000..0f946df71dc3
--- /dev/null
+++ b/sysutils/liburcu/distinfo
@@ -0,0 +1,2 @@
+SHA256 (userspace-rcu-0.7.6.tar.bz2) = 71f2c0b75f3473e4d7aa6ac5111ca4d9cccccd5d131e87b53a07d35bd2c5900a
+SIZE (userspace-rcu-0.7.6.tar.bz2) = 393590
diff --git a/sysutils/userspace-rcu/pkg-descr b/sysutils/liburcu/pkg-descr
index 31d2efae7acf..26ee55082b43 100644
--- a/sysutils/userspace-rcu/pkg-descr
+++ b/sysutils/liburcu/pkg-descr
@@ -6,4 +6,4 @@ given data structure to live at the same time, and by
 monitoring the data structure accesses to detect grace
 periods after which memory reclamation is possible.
 
-WWW:	http://lttng.org/content/userspace-rcu
+WWW: http://lttng.org/urcu
diff --git a/sysutils/userspace-rcu/pkg-plist b/sysutils/liburcu/pkg-plist
index 9ffd3170f590..9ffd3170f590 100644
--- a/sysutils/userspace-rcu/pkg-plist
+++ b/sysutils/liburcu/pkg-plist
diff --git a/sysutils/userspace-rcu/distinfo b/sysutils/userspace-rcu/distinfo
deleted file mode 100644
index ab1aa711f415..000000000000
--- a/sysutils/userspace-rcu/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (userspace-rcu-0.7.5.tar.bz2) = 0f7d4a1e0c6c6ecc75e7de0a4b80518c6ba93c97872981e196c758db7a2404e2
-SIZE (userspace-rcu-0.7.5.tar.bz2) = 383705