svn commit: r376613 - in head/net/ortp: . files

[Tijl Coosemans]

Author: tijl
Date: Fri Jan  9 15:12:09 2015
New Revision: 376613
URL: https://svnweb.freebsd.org/changeset/ports/376613
QAT: https://qat.redports.org/buildarchive/r376613/

Log:
  - Add SRTP and ZRTP support
  - Fix MASTER_SITES
  
  PR:		196249
  Approved by:	maintainer timeout (16 days)

Added:
  head/net/ortp/files/
  head/net/ortp/files/patch-configure   (contents, props changed)
  head/net/ortp/files/patch-ortp.pc.in   (contents, props changed)
Modified:
  head/net/ortp/Makefile

Modified: head/net/ortp/Makefile
==============================================================================
--- head/net/ortp/Makefile	Fri Jan  9 15:07:43 2015	(r376612)
+++ head/net/ortp/Makefile	Fri Jan  9 15:12:09 2015	(r376613)
@@ -3,8 +3,9 @@
 
 PORTNAME=	ortp
 PORTVERSION=	0.23.0
+PORTREVISION=	1
 CATEGORIES=	net
-MASTER_SITES=	SAVANNAH/linphone/ortp
+MASTER_SITES=	SAVANNAH/linphone/ortp/sources
 
 MAINTAINER=	sobomax at FreeBSD.org
 COMMENT=	Real-time Transport Protocol (RTP) library
@@ -12,11 +13,14 @@ COMMENT=	Real-time Transport Protocol (R
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+LIB_DEPENDS=	libsrtp.so:${PORTSDIR}/net/libsrtp \
+		libzrtpcppcore.so:${PORTSDIR}/security/libzrtpcppcore
+
 CONFLICTS_INSTALL=	linphone-base-[0-9]*
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-silent-rules --disable-strict
-CPPFLAGS+=	-DHAVE_DEV_RANDOM
+CONFIGURE_ARGS=	--disable-silent-rules --disable-strict \
+		--enable-zrtp --with-srtp
 INSTALL_TARGET=	install-strip
 USES=		libtool pathfix pkgconfig
 USE_LDCONFIG=	yes

Added: head/net/ortp/files/patch-configure
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/ortp/files/patch-configure	Fri Jan  9 15:12:09 2015	(r376613)
@@ -0,0 +1,20 @@
+--- configure.orig	2014-02-19 14:31:33 UTC
++++ configure
+@@ -12021,7 +12021,6 @@ $as_echo "#define NOCONNECT 1" >>confdef
+ 
+ $as_echo "#define NOCONNECT 1" >>confdefs.h
+ 
+-		PTHREAD_LDFLAGS="-pthread"
+ 	;;
+ 	*mingw32ce)
+ 		CFLAGS="$CFLAGS -D_WIN32_WCE -D_WIN32_WINNT=0x0501 -DORTP_STATIC"
+@@ -12211,7 +12210,8 @@ if test "${srtp_prefix}" != "none" ; the
+ 		SRTP_CFLAGS="-I${srtp_prefix}/include -I${srtp_prefix}/include/srtp"
+ 		SRTP_LIBS="-L${srtp_prefix}/lib"
+ 	fi
+-	SRTP_LIBS="$SRTP_LIBS -lsrtp"
++	SRTP_CFLAGS="$(pkg-config --cflags libsrtp)"
++	SRTP_LIBS="$(pkg-config --libs libsrtp)"
+ 
+ 		have_srtp=no
+ 	CPPFLAGS_save=$CPPFLAGS

Added: head/net/ortp/files/patch-ortp.pc.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/ortp/files/patch-ortp.pc.in	Fri Jan  9 15:12:09 2015	(r376613)
@@ -0,0 +1,10 @@
+--- ortp.pc.in.orig	2010-02-08 14:38:31 UTC
++++ ortp.pc.in
+@@ -6,5 +6,6 @@ includedir=@includedir@
+ Name: oRTP 
+ Description: Implement the RFC3550 (RTP) with a easy to use API with high and low level access. 
+ Version: @ORTP_PKGCONFIG_VERSION@                           
+-Libs: -L at libdir@ -lortp @ORTPDEPS_LIBS@
++Libs: -L at libdir@ -lortp
++Libs.private: @ORTPDEPS_LIBS@
+ Cflags: -I at includedir@ @ORTPDEPS_CFLAGS@