Bug 222804 - net/pjsip: fail to build net/pjsip-extsrtp - CONFLICTS with net/libsrtp
Summary: net/pjsip: fail to build net/pjsip-extsrtp - CONFLICTS with net/libsrtp
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Many People
Assignee: Guido Falsi
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2017-10-05 20:53 UTC by Vladimir Druzenko
Modified: 2017-11-18 20:56 UTC (History)
2 users (show)

See Also:

Attachments
net/pjsip fix CONFLICTS (252 bytes, patch)
2017-10-05 20:53 UTC, Vladimir Druzenko 		no flags Details | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Vladimir Druzenko freebsd_committer freebsd_triage 2017-10-05 20:53:55 UTC 
Created attachment 186928 [details]
net/pjsip fix CONFLICTS

net/pjsip: fail to build net/pjsip-extsrtp - CONFLICTS with and depends form net/libsrtp at same time

--- net/pjsip/Makefile.orig
+++ net/pjsip/Makefile
@@ -13,7 +13,7 @@
 
 LIB_DEPENDS=   libportaudio.so:audio/portaudio
 
-CONFLICTS=     pjsip-extsrtp-[0-9]* \
+CONFLICTS?=    pjsip-extsrtp-[0-9]* \
                libsrtp-[0-9]*
 
 GNU_CONFIGURE= yes
Comment 1 Guido Falsi freebsd_committer freebsd_triage 2017-10-06 08:01:25 UTC 
Thanks,

Looks correct, I'll commit shortly.

Strange enough I had no failure while testing this code.
Comment 2 commit-hook freebsd_committer freebsd_triage 2017-10-06 08:15:30 UTC 
A commit references this bug:

Author: madpilot
Date: Fri Oct  6 08:14:41 UTC 2017
New revision: 451358
URL: https://svnweb.freebsd.org/changeset/ports/451358

Log:
  Fix CONFLICTS to not overwrite slave port setting.

  PR:		222804
  Submitted by:	vvd@unislabs.com

Changes:
  head/net/pjsip/Makefile
Comment 3 Guido Falsi freebsd_committer freebsd_triage 2017-10-06 08:16:06 UTC 
Committed. Thanks!
Comment 4 commit-hook freebsd_committer freebsd_triage 2017-11-18 20:56:19 UTC 
A commit references this bug:

Author: madpilot
Date: Sat Nov 18 20:56:01 UTC 2017
New revision: 454459
URL: https://svnweb.freebsd.org/changeset/ports/454459

Log:
  MFH: r451278 r451306 r451358 r451461 r451734 r454258

  Register conflict with libsrtp.

  Reported by:	rodrigo

  - Update net/pjsip to 2.7
  - Bump PORTVERSION on asterisk13 port to avoid ABI problems
  - While here, sort the plist

  Fix CONFLICTS to not overwrite slave port setting.

  PR:		222804
  Submitted by:	vvd@unislabs.com

  Correctly handle option caused conflict.

  PR:		222845
  Submitted by:	O. Hartmann <ohartmann@walstatt.org>

  Update pjsip patch to work with libressl after the latest update
  to 2.7, which broke it.

  PR:		216898
  Submitted by:	OlivierW <olivierw1+bugzilla-freebsd@hotmail.com>

  - Update pjsip to 2.7.1
  - Import patches from the asterisk project
  - Regenrate patches

  Security:	19b052c9-c533-11e7-8da5-001999f8d30b

  Approved by:	ports-secteam (swills)

Changes:
_U  branches/2017Q4/
  branches/2017Q4/net/asterisk13/Makefile
  branches/2017Q4/net/pjsip/Makefile
  branches/2017Q4/net/pjsip/distinfo
  branches/2017Q4/net/pjsip/files/patch-aconfigure
  branches/2017Q4/net/pjsip/files/patch-pjlib_src_pj_ssl__sock__ossl.c
  branches/2017Q4/net/pjsip/files/patch-pjmedia_build_os-auto.mak.in
  branches/2017Q4/net/pjsip/files/patch-pjsip_src_pjsip_sip__multipart.c
  branches/2017Q4/net/pjsip/files/patch-pjsip_src_pjsip_sip__parser.c
  branches/2017Q4/net/pjsip/files/patch-pjsip_src_pjsip_sip__transaction.c
  branches/2017Q4/net/pjsip/files/patch-pjsip_src_pjsip_sip__transport.c
  branches/2017Q4/net/pjsip/files/patch-third__party_build_os-auto.mak.in
  branches/2017Q4/net/pjsip/pkg-plist