svn commit: r385557 - in head: . net net/asterisk13 net/pjsip net/pjsip-extsrtp

[Guido Falsi]

Author: madpilot
Date: Wed May  6 20:10:09 2015
New Revision: 385557
URL: https://svnweb.freebsd.org/changeset/ports/385557

Log:
  Add a slave port to net/pjsip to force installing pjsip with external
  SRTP library.
  
  Make the www/asterisk13 depend on this slave port when both SRTP
  and PJSIP options in it are enabled, this allows enabling SRTP
  support in asterisk13 without the need to manually reconfigure other
  ports.
  
  Reported by:	mat@ and a few others

Added:
  head/net/pjsip-extsrtp/
  head/net/pjsip-extsrtp/Makefile   (contents, props changed)
Modified:
  head/UPDATING
  head/net/Makefile
  head/net/asterisk13/Makefile
  head/net/pjsip/Makefile

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Wed May  6 20:06:33 2015	(r385556)
+++ head/UPDATING	Wed May  6 20:10:09 2015	(r385557)
@@ -5,6 +5,29 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20150506:
+  AFFECTS: users of net/asterisk13 with PJSIP (default on) and SRTP (default off) options enabled
+  AUTHOR: madpilot at FreeBSD.org
+
+  Due to asterisk13 requiring conflicting port options for the net/pjsip
+  dependency when the SRTP option is enabled together with the PJSIP
+  one I have created a new slave port to pjsip to enforce the
+  required option so asterisk can enforce that option with a
+  conditional dependency.
+
+  Users building custom packages with poudriere should have no
+  problems, since pkgng is able to handle the change automatically.
+
+  For users compiling from ports a simple update of asterisk will
+  keep it working because the already installed pjsip port will
+  satisfy the dependency. They anyway should, when convenient,
+  disinstall the pjsip port(this will also disinstall asterisk13)
+  and rebuild asterisk13 to force it to grab the correct dependency
+  to avoid problems with future updates.
+
+  Please check the 20150323 entry in this file which has some
+  background about this problem.
+
 20150501:
   AFFECTS: users of graphics/qgis
   AUTHOR: brd at FreeBSD.org

Modified: head/net/Makefile
==============================================================================
--- head/net/Makefile	Wed May  6 20:06:33 2015	(r385556)
+++ head/net/Makefile	Wed May  6 20:10:09 2015	(r385557)
@@ -869,6 +869,7 @@
     SUBDIR += pimdd
     SUBDIR += pipsecd
     SUBDIR += pjsip
+    SUBDIR += pjsip-extsrtp
     SUBDIR += pktanon
     SUBDIR += pload
     SUBDIR += plugdaemon

Modified: head/net/asterisk13/Makefile
==============================================================================
--- head/net/asterisk13/Makefile	Wed May  6 20:06:33 2015	(r385556)
+++ head/net/asterisk13/Makefile	Wed May  6 20:10:09 2015	(r385557)
@@ -2,7 +2,7 @@
 
 PORTNAME=	asterisk
 PORTVERSION=	13.3.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/asterisk/ \
 		http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/
@@ -113,7 +113,6 @@ LUA_CFLAGS=		-I${LUA_INCDIR}
 LUA_LDFLAGS=		-L${LUA_LIBDIR}
 LDAP_CONFIGURE_WITH=	ldap
 LDAP_USE=		OPENLDAP=yes
-PJSIP_LIB_DEPENDS=	libpj.so:${PORTSDIR}/net/pjsip
 PJSIP_CONFIGURE_WITH=	pjproject
 PJSIP_USES=		pkgconfig
 SPEEX_LIB_DEPENDS=	libspeex.so:${PORTSDIR}/audio/speex
@@ -128,8 +127,12 @@ GROUPS=	${ASTERISK_GROUP} dahdi
 
 .include <bsd.port.options.mk>
 
-.if ! ${PORT_OPTIONS:MPJSIP} && ${PORT_OPTIONS:MSRTP}
-LIB_DEPENDS+=		libsrtp.so:${PORTSDIR}/net/libsrtp
+.if ${PORT_OPTIONS:MPJSIP} && ${PORT_OPTIONS:MSRTP}
+LIB_DEPENDS+=	libpj.so:${PORTSDIR}/net/pjsip-extsrtp
+.elif ${PORT_OPTIONS:MPJSIP} && ! ${PORT_OPTIONS:MSRTP}
+LIB_DEPENDS+=   libpj.so:${PORTSDIR}/net/pjsip
+.elif ! ${PORT_OPTIONS:MPJSIP} && ${PORT_OPTIONS:MSRTP}
+LIB_DEPENDS+=   libsrtp.so:${PORTSDIR}/net/libsrtp
 .endif
 
 .include <bsd.port.pre.mk>

Added: head/net/pjsip-extsrtp/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/pjsip-extsrtp/Makefile	Wed May  6 20:10:09 2015	(r385557)
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+PKGNAMESUFFIX=	-extsrtp
+
+CONFLICTS=	pjsip-[0-9]*
+
+OPTIONS_SLAVE=	EXTSRTP
+MASTERDIR=	${.CURDIR}/../pjsip
+
+.include "${MASTERDIR}/Makefile"

Modified: head/net/pjsip/Makefile
==============================================================================
--- head/net/pjsip/Makefile	Wed May  6 20:06:33 2015	(r385556)
+++ head/net/pjsip/Makefile	Wed May  6 20:10:09 2015	(r385557)
@@ -2,7 +2,7 @@
 
 PORTNAME=	pjsip
 PORTVERSION=	2.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	http://www.pjsip.org/release/${PORTVERSION}/
 DISTNAME=	pjproject-${DISTVERSION}
@@ -14,6 +14,8 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	libportaudio.so.2:${PORTSDIR}/audio/portaudio2
 
+CONFLICTS=	pjsip-extsrtp-[0-9]*
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-external-pa \
 		--disable-silk