From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Dec 23 14:40:13 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 961A71065670 for ; Thu, 23 Dec 2010 14:40:13 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 6BE4E8FC14 for ; Thu, 23 Dec 2010 14:40:13 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id oBNEeD69099603 for ; Thu, 23 Dec 2010 14:40:13 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id oBNEeDcJ099602; Thu, 23 Dec 2010 14:40:13 GMT (envelope-from gnats) Date: Thu, 23 Dec 2010 14:40:13 GMT Message-Id: <201012231440.oBNEeDcJ099602@freefall.freebsd.org> To: freebsd-ports-bugs@FreeBSD.org From: "Richard E. Neese" Cc: Subject: ports/152789 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: "Richard E. Neese" List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Dec 2010 14:40:13 -0000 The following reply was made to PR ports/152789; it has been noted by GNATS. From: "Richard E. Neese" To: bug-followup@FreeBSD.org, saper@saper.info Cc: Subject: ports/152789 Date: Thu, 23 Dec 2010 09:35:48 -0500 This is a multi-part message in MIME format. --Multipart=_Thu__23_Dec_2010_09_35_48_-0500_erhbaCF.kxq8.iU_ Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit fixed python -- Richard E. Neese --Multipart=_Thu__23_Dec_2010_09_35_48_-0500_erhbaCF.kxq8.iU_ Content-Type: text/plain; name="freeswitch-core-12-23-10.diff" Content-Disposition: attachment; filename="freeswitch-core-12-23-10.diff" Content-Transfer-Encoding: 7bit Index: Makefile =================================================================== RCS file: /home/ncvs/ports/net/freeswitch-core/Makefile,v retrieving revision 1.16 diff -u -r1.16 Makefile --- Makefile 17 Dec 2010 17:40:21 -0000 1.16 +++ Makefile 23 Dec 2010 14:21:20 -0000 @@ -7,7 +7,7 @@ PORTNAME= freeswitch-core PORTVERSION= 201044 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= ftp://ftp.secure-computing.net/pub/freeswitch/ \ ftp://ftp2.secure-computing.net/pub/freeswitch/ \ @@ -121,7 +121,8 @@ MODSAYTH "Enable mod_say_th (Thi support)" off \ MODSAYZH "Enable mod_say_zh (Chinese support)" off \ EXTENSIONS "Include Default User Extensions" off \ - MODCALLCENTER "Enable mod_callcenter (new)(test)" on + MODCALLCENTER "Enable mod_callcenter (new)" on \ + ZRTP "ENABLE ZRTP (VOIP ENCRYPTION)(NEW)(TEST)" off .include @@ -136,8 +137,8 @@ .for i in MODFLITE MODPOCKETSPHINX MODCIDLOOKUP MODDPDIRECTORY MODEASYROUTE MODLCR MODSOUNDTOUCH \ MODRSS MODSNOM MODAVMD MODVMD MODSPY MODAMRWB MODCELT MODMULTICAST MODPORTAUDIO MODCURL MODXMLCURL \ MODSAYDE MODSAYEN MODSAYES MODSAYFR MODSAYHU MODSAYIT MODSAYNL MODSAYRU MODSAYTH MODSAYZH \ - MODNIBBLEBILL MODDINGALING MODDIRECTORY MODMEMCACHE MODPYTHON MODPASTREAM MODSHELLSTREAM \ - MODSILK MODUNIMRCP MODTTSCMDLINE MODDISTRIBUTOR MODSNAPSHOT MODSKINNY EXTENSIONS MODCALLCENTER MODCODEC2 + MODNIBBLEBILL MODDINGALING MODDIRECTORY MODMEMCACHE MODPASTREAM MODSHELLSTREAM MODSILK MODUNIMRCP \ + MODTTSCMDLINE MODDISTRIBUTOR MODSNAPSHOT MODSKINNY EXTENSIONS MODCALLCENTER MODCODEC2 .if !defined(WITH_${i}) PLIST_SUB+= WITH_${i}="@comment " .else @@ -188,6 +189,22 @@ BUILD_DEPENDS+= ${LOCALBASE}/lib/erlang/usr/include/erl_driver.h:${PORTSDIR}/lang/erlang-lite .endif +.if !defined(WITH_ZRTP) +PLIST_SUB+= WITH_ZRTP="@comment" +.else +PLIST_SUB+= WITH_ZRTP="" +CONFIGURE_ARGS+= --enable-zrtp +BUILD_DEPENDS+= ${LOCALBASE}/lib/libzrtp.a:${PORTSDIR}/devel/libzrtp +RUN_DEPENDS+= ${LOCALBASE}/lib/libzrtp.a:${PORTSDIR}/devel/libzrtp +.endif + +.if !defined(WITH_MODPYTHON) +PLIST_SUB+= WITH_MODPYTHON="@comment" +.else +PLIST_SUB+= WITH_MODPYTHON="" +USE_PYTHON= yes +.endif + pre-configure: @${REINPLACE_CMD} -e 's|pkgconfigdir = $$(libdir)/pkgconfig|pkgconfigdir = ${PREFIX}/libdata/pkgconfig|g' ${WRKSRC}/libs/*/Makefile.am @${REINPLACE_CMD} -e 's|pkgconfigdir = $$(libdir)/pkgconfig|pkgconfigdir = ${PREFIX}/libdata/pkgconfig|g' ${WRKSRC}/libs/*/Makefile.am Index: files/patch-build-getlib.sh.in =================================================================== RCS file: files/patch-build-getlib.sh.in diff -N files/patch-build-getlib.sh.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-build-getlib.sh.in 23 Dec 2010 14:21:20 -0000 @@ -0,0 +1,18 @@ +--- build/getlib.sh.in 2010-12-22 12:39:49.000000000 -0500 ++++ build/getlib.sh.in.orig 2010-12-22 12:34:04.000000000 -0500 +@@ -5,11 +5,11 @@ + WGET=@WGET@ + CURL=@CURL@ + +-if [ -f "$WGET" ] ; then +- DOWNLOAD_CMD=$WGET +-else +- if [ -f "$CURL" ] ; then ++if [ -f "$CURL" ] ; then + DOWNLOAD_CMD="$CURL -O" ++else ++ if [ -f "$WGET" ] ; then ++ DOWNLOAD_CMD=$WGET + fi + fi + --Multipart=_Thu__23_Dec_2010_09_35_48_-0500_erhbaCF.kxq8.iU_--