diff --git a/audio/ccaudio2/Makefile b/audio/ccaudio2/Makefile
index 6ca1744a1d1f..e9ccbfb5894c 100644
--- a/audio/ccaudio2/Makefile
+++ b/audio/ccaudio2/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ccaudio2
 PORTVERSION=	2.0.5
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio
 MASTER_SITES=	http://www.gnutelephony.org/dist/tarballs/
 
@@ -17,7 +17,6 @@ LIB_DEPENDS=	libccgnu2.so:${PORTSDIR}/devel/commoncpp \
 
 CONFLICTS=	ccaudio-[0-9]*
 
-NO_STAGE=	yes
 USES=		pathfix cmake:outsource pkgconfig
 USE_LDCONFIG=	yes
 
diff --git a/devel/ccrtp/Makefile b/devel/ccrtp/Makefile
index 00b9f39b3950..a41b240281a8 100644
--- a/devel/ccrtp/Makefile
+++ b/devel/ccrtp/Makefile
@@ -3,13 +3,14 @@
 
 PORTNAME=	ccrtp
 PORTVERSION=	2.0.6
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	GNU
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Implementation of the real-time transport protocol
 
-LIB_DEPENDS=	commoncpp:${PORTSDIR}/devel/ucommon \
+LIB_DEPENDS=	libcommoncpp.so:${PORTSDIR}/devel/ucommon \
 		libgcrypt.so:${PORTSDIR}/security/libgcrypt
 
 GNU_CONFIGURE=	yes
@@ -20,9 +21,12 @@ CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -pthread"
 CPPFLAGS+=	-I${LOCALBASE}/include
 INFO=	ccrtp
 
-NO_STAGE=	yes
 post-patch:
 	@cd ${WRKSRC}/src && \
 		${FIND} * -type f -exec ${REINPLACE_CMD} -i "" -e "s|<malloc.h>|<stdlib.h>|g" "{}" \;
 
+post-configure:
+	${FIND} ${WRKSRC} -name Makefile | ${XARGS} \
+	    ${REINPLACE_CMD} -e 's|-l-pthread|-pthread|g'
+
 .include <bsd.port.mk>
diff --git a/devel/libzrtpcpp/Makefile b/devel/libzrtpcpp/Makefile
index 0bed605fac10..35b03740e126 100644
--- a/devel/libzrtpcpp/Makefile
+++ b/devel/libzrtpcpp/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	libzrtpcpp
 PORTVERSION=	2.3.4
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=ccrtp
@@ -10,8 +11,8 @@ MASTER_SITE_SUBDIR=ccrtp
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	ZRTP extension for GNU ccRTP
 
-LIB_DEPENDS=	ccrtp:${PORTSDIR}/devel/ccrtp \
-		gcrypt:${PORTSDIR}/security/libgcrypt
+LIB_DEPENDS=	libccrtp.so:${PORTSDIR}/devel/ccrtp \
+		libgcrypt.so:${PORTSDIR}/security/libgcrypt
 
 USES=		cmake iconv gettext pkgconfig
 USE_OPENSSL=	yes