From owner-svn-ports-all@freebsd.org Sat Sep 10 19:58:56 2016 Return-Path: Delivered-To: svn-ports-all@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 4BBC7BD5882; Sat, 10 Sep 2016 19:58:56 +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 010A1BBA; Sat, 10 Sep 2016 19:58:55 +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 u8AJwtkt095400; Sat, 10 Sep 2016 19:58:55 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8AJwtR0095399; Sat, 10 Sep 2016 19:58:55 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201609101958.u8AJwtR0095399@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Sat, 10 Sep 2016 19:58:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r421736 - head/net/appkonference X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 Sep 2016 19:58:56 -0000 Author: madpilot Date: Sat Sep 10 19:58:54 2016 New Revision: 421736 URL: https://svnweb.freebsd.org/changeset/ports/421736 Log: - Remove depdency on net/asterisk - Add options to choose to depend on asterisk11 or asterisk13, with the latter as default - Fix building with clang Based on a patch kindly proposed by KATO Tsuguru Modified: head/net/appkonference/Makefile Modified: head/net/appkonference/Makefile ============================================================================== --- head/net/appkonference/Makefile Sat Sep 10 19:57:27 2016 (r421735) +++ head/net/appkonference/Makefile Sat Sep 10 19:58:54 2016 (r421736) @@ -3,6 +3,7 @@ PORTNAME= appkonference PORTVERSION= 2.7 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= SF @@ -12,21 +13,31 @@ COMMENT= High-performance Asterisk voice LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= asterisk:net/asterisk -RUN_DEPENDS= asterisk:net/asterisk - - USE_CSTD= gnu89 USES= compiler:features gmake WRKSRC= ${WRKDIR}/${PORTNAME}/konference PLIST_FILES= lib/asterisk/modules/app_konference.so -ONLY_FOR_ARCHS= amd64 arm i386 ia64 +ONLY_FOR_ARCHS= amd64 armv6 i386 powerpc sparc64 ONLY_FOR_ARCHS_REASON= not yet ported to this architecture OPTIONS_DEFINE= OPTIMIZED_CFLAGS -OPTIONS_DEFAULT= OPTIMIZED_CFLAGS +OPTIONS_DEFAULT= ASTERISK13 OPTIMIZED_CFLAGS +OPTIONS_SINGLE= ASTERISK +OPTIONS_SINGLE_ASTERISK=ASTERISK11 ASTERISK13 + +ASTERISK_DESC= Asterisk version +ASTERISK11_DESC= Asterisk 11.x support +ASTERISK13_DESC= Asterisk 13.x support + +ASTERISK11_BUILD_DEPENDS= asterisk11>0:net/asterisk11 +ASTERISK11_RUN_DEPENDS= asterisk11>0:net/asterisk11 +ASTERISK11_MAKE_ARGS= ASTERISK_SRC_VERSION=1100 + +ASTERISK13_BUILD_DEPENDS= asterisk13>0:net/asterisk13 +ASTERISK13_RUN_DEPENDS= asterisk13>0:net/asterisk13 +ASTERISK13_MAKE_ARGS= ASTERISK_SRC_VERSION=1300 OPTIMIZED_CFLAGS_CFLAGS= -O3 -ffast-math @@ -36,4 +47,8 @@ OPTIMIZED_CFLAGS_CFLAGS= -O3 -ffast-math CFLAGS+= -funroll-all-loops -fsingle-precision-constant .endif +.if ${CHOSEN_COMPILER_TYPE} == clang +CFLAGS+= -fblocks +.endif + .include