From owner-svn-ports-head@freebsd.org  Wed Apr 19 17:38:18 2017
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 355C0D466A7;
 Wed, 19 Apr 2017 17:38:18 +0000 (UTC)
 (envelope-from madpilot@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 03E251BC2;
 Wed, 19 Apr 2017 17:38:17 +0000 (UTC)
 (envelope-from madpilot@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v3JHcHI4016148;
 Wed, 19 Apr 2017 17:38:17 GMT (envelope-from madpilot@FreeBSD.org)
Received: (from madpilot@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v3JHcH8R016147;
 Wed, 19 Apr 2017 17:38:17 GMT (envelope-from madpilot@FreeBSD.org)
Message-Id: <201704191738.v3JHcH8R016147@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: madpilot set sender to
 madpilot@FreeBSD.org using -f
From: Guido Falsi <madpilot@FreeBSD.org>
Date: Wed, 19 Apr 2017 17:38:17 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r438897 - head/net/asterisk11
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 19 Apr 2017 17:38:18 -0000

Author: madpilot
Date: Wed Apr 19 17:38:16 2017
New Revision: 438897
URL: https://svnweb.freebsd.org/changeset/ports/438897

Log:
  - Force asterisk11 to use bundled libedit, otherwise it could link
    with ports provided one, with which it has incompatibilities
  - While here, remove asterisk 1.8 from CONFLICTS, it is not available
    anymore as a port
  
  PR:		218752
  Submitted by:	yani@pi-greece.eu

Modified:
  head/net/asterisk11/Makefile

Modified: head/net/asterisk11/Makefile
==============================================================================
--- head/net/asterisk11/Makefile	Wed Apr 19 17:17:33 2017	(r438896)
+++ head/net/asterisk11/Makefile	Wed Apr 19 17:38:16 2017	(r438897)
@@ -2,6 +2,7 @@
 
 PORTNAME=	asterisk
 PORTVERSION=	11.25.1
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729
 MASTER_SITE_SUBDIR=	asterisk/ \
@@ -30,7 +31,8 @@ USE_RC_SUBR=	asterisk
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-ilbc=internal \
 			--with-crypto=${OPENSSLBASE} \
-			--with-ssl=${OPENSSLBASE}
+			--with-ssl=${OPENSSLBASE} \
+			--with-libedit=internal
 
 CPE_VENDOR=	digium
 
@@ -48,7 +50,7 @@ MAKE_ARGS+=	NOISY_BUILD=yes \
 		ASTDATADIR=${DATADIR}
 
 CONFLICTS_BUILD=	linuxthreads-* pjsip-*
-CONFLICTS_INSTALL=	asterisk*-1.8* asterisk*-13*
+CONFLICTS_INSTALL=	asterisk*-13*
 
 OPTIONS_DEFINE=			BACKTRACE CURL EXCHANGE FREETDS LDAP LUA \
 				MP3PLAYER OOH323 RADIUS SNMP SPANDSP SRTP \