Add support for new module. (libzrtp)

Fix fetch issue when host system has wget installed.
Fix missing depend when python module is selected.

PR:	ports/152789
Submitted by:	Marcin Cieslak <saper@saper.info>
Approved by:	"Richard E. Neese" <r.neese@gmail.com> (maintainer)

2 files changed, 39 insertions, 4 deletions

diff --git a/net/freeswitch-core/Makefile b/net/freeswitch-core/Makefile
index ca3cc13b8b02..9c463bd1deea 100644
--- a/net/freeswitch-core/Makefile
+++ b/net/freeswitch-core/Makefile
@@ -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/ \
@@ -82,7 +82,7 @@ OPTIONS=	MODSHOUT        "Enable mod_shout (streaming audio/mp3)" on \
 		MODDPDIRECTORY	"Enable mod_dialplan_directory" off \
 		MODDIRECTORY	"Enable mod_directory" on \
  		MODDINGALING	"Enable mod_dingaling(google talk)" on \
-		MODEASYROUTE	"Enable mod_easyroute(routeing tool)" on \
+		MODEASYROUTE	"Enable mod_easyroute(routing tool)" on \
 		MODERLANGEVENT  "Enable mod_erlang_event (Call Center Dist)" off \
 		MODFAX		"Enable mod_fax" on \
 		MODLCR		"Enable mod_lcr (least cost routing)" on \
@@ -121,7 +121,8 @@ OPTIONS=	MODSHOUT        "Enable mod_shout (streaming audio/mp3)" on \
 		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 <bsd.port.options.mk>
 
@@ -136,7 +137,7 @@ CFLAGS+=	-fPIC
 .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 \
+	MODNIBBLEBILL MODDINGALING MODDIRECTORY MODMEMCACHE MODPASTREAM MODSHELLSTREAM \
 	MODSILK MODUNIMRCP MODTTSCMDLINE MODDISTRIBUTOR MODSNAPSHOT MODSKINNY EXTENSIONS MODCALLCENTER MODCODEC2
 .if !defined(WITH_${i})
 PLIST_SUB+=	WITH_${i}="@comment "
@@ -188,6 +189,22 @@ PLIST_SUB+=	WITH_MODERLANGEVENT=""
 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
diff --git a/net/freeswitch-core/files/patch-build-getlib.sh.in b/net/freeswitch-core/files/patch-build-getlib.sh.in
new file mode 100644
index 000000000000..6d3f986341da
--- /dev/null
+++ b/net/freeswitch-core/files/patch-build-getlib.sh.in
@@ -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
+