Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 10 Sep 2016 19:58:55 +0000 (UTC)
From:      Guido Falsi <madpilot@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r421736 - head/net/appkonference
Message-ID:  <201609101958.u8AJwtR0095399@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <tkato432 at yahoo.com>

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 <bsd.port.post.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609101958.u8AJwtR0095399>