- Update to 2.3.4

- Add missing dependencies

5 files changed, 30 insertions, 22 deletions

diff --git a/devel/libzrtpcpp/Makefile b/devel/libzrtpcpp/Makefile
index 1adfe152a6a0..0bed605fac10 100644
--- a/devel/libzrtpcpp/Makefile
+++ b/devel/libzrtpcpp/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libzrtpcpp
-PORTVERSION=	2.3.2
-PORTREVISION=	2
+PORTVERSION=	2.3.4
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=ccrtp
@@ -14,7 +13,7 @@ COMMENT=	ZRTP extension for GNU ccRTP
 LIB_DEPENDS=	ccrtp:${PORTSDIR}/devel/ccrtp \
 		gcrypt:${PORTSDIR}/security/libgcrypt
 
-USES=		cmake
+USES=		cmake iconv gettext pkgconfig
 USE_OPENSSL=	yes
 WITH_OPENSSL_PORT=yes
 
diff --git a/devel/libzrtpcpp/distinfo b/devel/libzrtpcpp/distinfo
index 5979d8b87585..f162875ccf0e 100644
--- a/devel/libzrtpcpp/distinfo
+++ b/devel/libzrtpcpp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libzrtpcpp-2.3.2.tar.gz) = a008f749b83653b06a24e889f23569abce8caf6fe4d324a9fbf43e933bd7dec1
-SIZE (libzrtpcpp-2.3.2.tar.gz) = 256951
+SHA256 (libzrtpcpp-2.3.4.tar.gz) = 03e5d4de487fd154177cf2b7a45600b1c8df783136e4f01a9ebc6104b3771008
+SIZE (libzrtpcpp-2.3.4.tar.gz) = 257234
diff --git a/devel/libzrtpcpp/files/patch-CMakeLists.txt b/devel/libzrtpcpp/files/patch-CMakeLists.txt
index 429f2c2b8104..8110285dd893 100644
--- a/devel/libzrtpcpp/files/patch-CMakeLists.txt
+++ b/devel/libzrtpcpp/files/patch-CMakeLists.txt
@@ -1,17 +1,26 @@
---- CMakeLists.txt	2012-10-17 08:16:16.000000000 -0500
-+++ CMakeLists.txt	2012-12-13 02:24:32.000000000 -0500
-@@ -115,8 +115,8 @@
- #  set(CRYPTOBACKEND="")
- #  set(PACKAGE_REQ "libgcrypt")
- #else()
--  pkg_check_modules(OPENSSL libcrypto>=0.9.8)
--  if (OPENSSL_FOUND)
-+  find_library(OPENSSL_LIB crypto $ENV{OPENSSLLIB})
-+  if (OPENSSL_LIB)
-     set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${OPENSSL_INCLUDE_DIRS}) #update include files search directory
-     check_include_files(openssl/bn.h HAVE_OPENSSL_BN_H)
-     check_include_files(openssl/aes.h HAVE_OPENSSL_AES_H)
-@@ -162,17 +162,13 @@
+--- CMakeLists.txt	2013-07-01 04:10:34.000000000 -0500
++++ CMakeLists.txt	2013-10-02 13:32:43.000000000 -0500
+@@ -107,8 +107,8 @@
+ endif()
+ 
+ # now get info about crypto libraries
+-pkg_check_modules(OPENSSL libcrypto>=0.9.8)
+-if (OPENSSL_FOUND)
++find_library(OPENSSL_LIB crypto $ENV{OPENSSLLIB})
++if (OPENSSL_LIB)
+   set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${OPENSSL_INCLUDE_DIRS}) #update include files search directory
+   check_include_files(openssl/bn.h HAVE_OPENSSL_BN_H)
+   check_include_files(openssl/aes.h HAVE_OPENSSL_AES_H)
+@@ -133,7 +133,7 @@
+   endif()
+ endif()
+ 
+-if(NOT OPENSSL_FOUND AND NOT GCRYPT_FOUND)
++if(NOT OPENSSL_LIB AND NOT GCRYPT_FOUND)
+   message(FATAL_ERROR "No crypto library found")
+ endif()
+ 
+@@ -167,17 +167,13 @@
  
  add_subdirectory(src)
  
diff --git a/devel/libzrtpcpp/pkg-descr b/devel/libzrtpcpp/pkg-descr
index f4f03c98eb42..1f632f96aedd 100644
--- a/devel/libzrtpcpp/pkg-descr
+++ b/devel/libzrtpcpp/pkg-descr
@@ -1,4 +1,4 @@
-A separate extension package for GNU ccRTP, it provides support for the ZRTP 
+A separate extension package for GNU ccRTP, it provides support for the ZRTP
 protocol (as defined in the Internet draft draft-zimmermann-avt-zrtp).
 
-WWW:	http://www.gnu.org/software/ccrtp/
+WWW: http://www.gnu.org/software/ccrtp/
diff --git a/devel/libzrtpcpp/pkg-plist b/devel/libzrtpcpp/pkg-plist
index d38be899e3d8..537ee7265e24 100644
--- a/devel/libzrtpcpp/pkg-plist
+++ b/devel/libzrtpcpp/pkg-plist
@@ -6,7 +6,7 @@ include/libzrtpcpp/ZrtpQueue.h
 include/libzrtpcpp/ZrtpUserCallback.h
 include/libzrtpcpp/zrtpccrtp.h
 include/libzrtpcpp/TimeoutProvider.h
-lib/libzrtpcpp.so.2.3.2
+lib/libzrtpcpp.so.2.3.4
 lib/libzrtpcpp.so.2
 lib/libzrtpcpp.so
 libdata/pkgconfig/libzrtpcpp.pc