svn commit: r308856 - in head/devel/libzrtpcpp: . files
Jose Alonso Cardenas Marquez
acm at FreeBSD.org
Thu Dec 13 16:17:21 UTC 2012
Author: acm
Date: Thu Dec 13 16:17:19 2012
New Revision: 308856
URL: http://svnweb.freebsd.org/changeset/ports/308856
Log:
- Update to 2.3.2
PR: 170635
Submitted by: Waitman Gobble <uzimac at da3m0n8t3r.com>
Added:
head/devel/libzrtpcpp/files/patch-CMakeLists.txt (contents, props changed)
Deleted:
head/devel/libzrtpcpp/files/patch-Makefile.in
head/devel/libzrtpcpp/files/patch-src_Makefile.in
Modified:
head/devel/libzrtpcpp/Makefile
head/devel/libzrtpcpp/distinfo
head/devel/libzrtpcpp/files/patch-src-libzrtpcpp_ZrtpPacketBase.h
head/devel/libzrtpcpp/pkg-plist
Modified: head/devel/libzrtpcpp/Makefile
==============================================================================
--- head/devel/libzrtpcpp/Makefile Thu Dec 13 16:10:12 2012 (r308855)
+++ head/devel/libzrtpcpp/Makefile Thu Dec 13 16:17:19 2012 (r308856)
@@ -6,8 +6,8 @@
#
PORTNAME= libzrtpcpp
-PORTVERSION= 1.4.6
-PORTREVISION= 3
+PORTVERSION= 2.3.2
+PORTREVISION= 0
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR=ccrtp
@@ -15,14 +15,15 @@ MASTER_SITE_SUBDIR=ccrtp
MAINTAINER= acm at FreeBSD.org
COMMENT= ZRTP extension for GNU ccRTP
-LIB_DEPENDS= ccrtp1-1.7.0:${PORTSDIR}/devel/ccrtp \
+LIB_DEPENDS= ccrtp:${PORTSDIR}/devel/ccrtp \
gcrypt.18:${PORTSDIR}/security/libgcrypt
-GNU_CONFIGURE= yes
-USE_GMAKE= yes
+USE_CMAKE= yes
USE_OPENSSL= yes
+WITH_OPENSSL_PORT=yes
-CPPFLAGS+= -I${LOCALBASE}/include -I${OPENSSLINC}
+CMAKE_ARGS+= -DBUILD_SHARED_LIBS:BOOL=ON
+CXXFLAGS+= -I${LOCALBASE}/include -I${OPENSSLINC}
LDFLAGS+= -L${LOCALBASE}/lib -L${OPENSSLLIB}
USE_LDCONFIG= yes
@@ -30,6 +31,7 @@ post-patch:
@cd ${WRKSRC}/src && \
${FIND} * -type f -exec ${REINPLACE_CMD} -i "" -e "s|<malloc.h>|<stdlib.h>|g" "{}" \; && \
${FIND} * -type f -exec ${REINPLACE_CMD} -i "" -e "s|<stdint.h>|<inttypes.h>|g" "{}" \;
- @${REINPLACE_CMD} -e "s|-lpthread|${PTHREAD_LIBS}|g" ${WRKSRC}/${CONFIGURE_SCRIPT}
+ @${REINPLACE_CMD} -e "s|int32_t dataLength);|int32_t dataLength)|g" \
+ ${WRKSRC}/src/libzrtpcpp/crypto/gcrypt/gcryptAesCFB.cpp
.include <bsd.port.mk>
Modified: head/devel/libzrtpcpp/distinfo
==============================================================================
--- head/devel/libzrtpcpp/distinfo Thu Dec 13 16:10:12 2012 (r308855)
+++ head/devel/libzrtpcpp/distinfo Thu Dec 13 16:17:19 2012 (r308856)
@@ -1,2 +1,2 @@
-SHA256 (libzrtpcpp-1.4.6.tar.gz) = 1ea5ce5a283095a7bf2fe491a8a7571ef21b3dbe6cf815d3df76e6de1e811dba
-SIZE (libzrtpcpp-1.4.6.tar.gz) = 461600
+SHA256 (libzrtpcpp-2.3.2.tar.gz) = a008f749b83653b06a24e889f23569abce8caf6fe4d324a9fbf43e933bd7dec1
+SIZE (libzrtpcpp-2.3.2.tar.gz) = 256951
Added: head/devel/libzrtpcpp/files/patch-CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/libzrtpcpp/files/patch-CMakeLists.txt Thu Dec 13 16:17:19 2012 (r308856)
@@ -0,0 +1,32 @@
+--- 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 @@
+
+ add_subdirectory(src)
+
+-if (enable_ccrtp)
+- add_subdirectory(demo)
+-endif()
+-
+ if (NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/package/)
+ MESSAGE(STATUS "package dir not found")
+ file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/package/)
+ endif()
+
+ ########### install files ###############
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/lib${zrtplib}.pc DESTINATION ${LIBDIRNAME}/pkgconfig)
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/lib${zrtplib}.pc DESTINATION ${LIBDIRNAME}data/pkgconfig)
+
+ if(${PROJECT_NAME} STREQUAL ${CMAKE_PROJECT_NAME})
+
Modified: head/devel/libzrtpcpp/files/patch-src-libzrtpcpp_ZrtpPacketBase.h
==============================================================================
--- head/devel/libzrtpcpp/files/patch-src-libzrtpcpp_ZrtpPacketBase.h Thu Dec 13 16:10:12 2012 (r308855)
+++ head/devel/libzrtpcpp/files/patch-src-libzrtpcpp_ZrtpPacketBase.h Thu Dec 13 16:17:19 2012 (r308856)
@@ -1,10 +1,10 @@
---- src/libzrtpcpp/ZrtpPacketBase.h 2008-12-10 14:30:18.000000000 -0500
-+++ src/libzrtpcpp/ZrtpPacketBase.h 2008-12-10 14:30:38.000000000 -0500
-@@ -26,6 +26,7 @@
- #include <stdint.h>
- #include <string.h>
- #include <stdlib.h>
+--- src/libzrtpcpp/ZrtpPacketBase.h 2012-10-17 08:16:16.000000000 -0500
++++ src/libzrtpcpp/ZrtpPacketBase.h 2012-12-13 01:23:58.000000000 -0500
+@@ -41,6 +41,7 @@
+ #if defined(_MSC_VER) || defined(WIN32) || defined(_WIN32)
+ #include <winsock2.h>
+ #else
+#include <sys/types.h>
#include <netinet/in.h>
+ #endif
- #include <libzrtpcpp/zrtpPacket.h>
Modified: head/devel/libzrtpcpp/pkg-plist
==============================================================================
--- head/devel/libzrtpcpp/pkg-plist Thu Dec 13 16:10:12 2012 (r308855)
+++ head/devel/libzrtpcpp/pkg-plist Thu Dec 13 16:17:19 2012 (r308856)
@@ -1,12 +1,13 @@
-include/libzrtpcpp/ZrtpCodes.h
include/libzrtpcpp/ZrtpCallback.h
+include/libzrtpcpp/ZrtpCodes.h
+include/libzrtpcpp/ZrtpConfigure.h
+include/libzrtpcpp/ZrtpCWrapper.h
include/libzrtpcpp/ZrtpQueue.h
include/libzrtpcpp/ZrtpUserCallback.h
include/libzrtpcpp/zrtpccrtp.h
include/libzrtpcpp/TimeoutProvider.h
-lib/libzrtpcpp.so.0
+lib/libzrtpcpp.so.2.3.2
+lib/libzrtpcpp.so.2
lib/libzrtpcpp.so
-lib/libzrtpcpp.la
-lib/libzrtpcpp.a
libdata/pkgconfig/libzrtpcpp.pc
@dirrm include/libzrtpcpp
More information about the svn-ports-all
mailing list