Attachment #151191 for bug #196249





PORTNAME=	ortp
PORTVERSION=	0.23.0
PORTREVISION=	1
CATEGORIES=	net
MASTER_SITES=	SAVANNAH/linphone/ortp/sources

MAINTAINER=	sobomax@FreeBSD.org
COMMENT=	Real-time Transport Protocol (RTP) library


GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--disable-silent-rules --disable-strict
CPPFLAGS+=	-DHAVE_DEV_RANDOM
INSTALL_TARGET=	install-strip
USES=		libtool pathfix pkgconfig
USE_LDCONFIG=	yes

OPTIONS_DEFINE=	SRTP ZRTP
OPTIONS_DEFAULT=SRTP ZRTP

SRTP_DESC=		Secure RTP support
SRTP_LIB_DEPENDS=	libsrtp.so:${PORTSDIR}/net/libsrtp
SRTP_CONFIGURE_ON=	--with-srtp
SRTP_CONFIGURE_OFF=	--with-srtp=none

ZRTP_DESC=		SRTP with secure key exchange (RFC 6189) (LGPL3)
ZRTP_LIB_DEPENDS=	libzrtpcppcore.so:${PORTSDIR}/security/libzrtpcppcore
ZRTP_CONFIGURE_ENABLE=	zrtp

.include <bsd.port.mk>




--- 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

Line 0 Link Here

(-)net/ortp/files/patch-ortp.pc.in (+10 lines)
	1	--- ortp.pc.in.orig 2010-02-08 14:38:31 UTC
	2	+++ ortp.pc.in
	3	@@ -6,5 +6,6 @@ includedir=@includedir@
	4	Name: oRTP
	5	Description: Implement the RFC3550 (RTP) with a easy to use API with high and low level access.
	6	Version: @ORTP_PKGCONFIG_VERSION@
	7	-Libs: -L@libdir@ -lortp @ORTPDEPS_LIBS@
	8	+Libs: -L@libdir@ -lortp
	9	+Libs.private: @ORTPDEPS_LIBS@
	10	Cflags: -I@includedir@ @ORTPDEPS_CFLAGS@

Return to bug 196249

Lines 3-10 Link Here

(-)net/ortp/Makefile (-2 / +14 lines)
3		3
4	PORTNAME= ortp	4	PORTNAME= ortp
5	PORTVERSION= 0.23.0	5	PORTVERSION= 0.23.0
		6	PORTREVISION= 1
6	CATEGORIES= net	7	CATEGORIES= net
7	MASTER_SITES= SAVANNAH/linphone/ortp	8	MASTER_SITES= SAVANNAH/linphone/ortp/sources
8		9
9	MAINTAINER= sobomax@FreeBSD.org	10	MAINTAINER= sobomax@FreeBSD.org
10	COMMENT= Real-time Transport Protocol (RTP) library	11	COMMENT= Real-time Transport Protocol (RTP) library
Lines 16-24 CONFLICTS_INSTALL= linphone-base-[0-9]* Link Here
16		17
17	GNU_CONFIGURE= yes	18	GNU_CONFIGURE= yes
18	CONFIGURE_ARGS= --disable-silent-rules --disable-strict	19	CONFIGURE_ARGS= --disable-silent-rules --disable-strict
19	CPPFLAGS+= -DHAVE_DEV_RANDOM
20	INSTALL_TARGET= install-strip	20	INSTALL_TARGET= install-strip
21	USES= libtool pathfix pkgconfig	21	USES= libtool pathfix pkgconfig
22	USE_LDCONFIG= yes	22	USE_LDCONFIG= yes
23		23
		24	OPTIONS_DEFINE= SRTP ZRTP
		25	OPTIONS_DEFAULT=SRTP ZRTP
		26
		27	SRTP_DESC= Secure RTP support
		28	SRTP_LIB_DEPENDS= libsrtp.so:${PORTSDIR}/net/libsrtp
		29	SRTP_CONFIGURE_ON= --with-srtp
		30	SRTP_CONFIGURE_OFF= --with-srtp=none
		31
		32	ZRTP_DESC= SRTP with secure key exchange (RFC 6189) (LGPL3)
		33	ZRTP_LIB_DEPENDS= libzrtpcppcore.so:${PORTSDIR}/security/libzrtpcppcore
		34	ZRTP_CONFIGURE_ENABLE= zrtp
		35
24	.include <bsd.port.mk>	36	.include <bsd.port.mk>

Line 0 Link Here

(-)net/ortp/files/patch-configure (+20 lines)
	1	--- configure.orig 2014-02-19 14:31:33 UTC
	2	+++ configure
	3	@@ -12021,7 +12021,6 @@ $as_echo "#define NOCONNECT 1" >>confdef
	4
	5	$as_echo "#define NOCONNECT 1" >>confdefs.h
	6
	7	- PTHREAD_LDFLAGS="-pthread"
	8	;;
	9	*mingw32ce)
	10	CFLAGS="$CFLAGS -D_WIN32_WCE -D_WIN32_WINNT=0x0501 -DORTP_STATIC"
	11	@@ -12211,7 +12210,8 @@ if test "${srtp_prefix}" != "none" ; the
	12	SRTP_CFLAGS="-I${srtp_prefix}/include -I${srtp_prefix}/include/srtp"
	13	SRTP_LIBS="-L${srtp_prefix}/lib"
	14	fi
	15	- SRTP_LIBS="$SRTP_LIBS -lsrtp"
	16	+ SRTP_CFLAGS="$(pkg-config --cflags libsrtp)"
	17	+ SRTP_LIBS="$(pkg-config --libs libsrtp)"
	18
	19	have_srtp=no
	20	CPPFLAGS_save=$CPPFLAGS