10 files changed, 104 insertions, 80 deletions

diff --git a/net/asterisk/Makefile b/net/asterisk/Makefile
index 2f55bf32fcb5..4bd13166fcd9 100644
--- a/net/asterisk/Makefile
+++ b/net/asterisk/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	asterisk
-PORTVERSION=	1.8.3.3
+PORTVERSION=	1.8.4
 CATEGORIES=	net
 MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/asterisk/ \
 		http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/
@@ -60,7 +60,9 @@ OPTIONS=	OGGVORBIS	"Enable Ogg Vorbis support" on \
 		ILBC		"Enable iLBC codec" off \
 		SPANDSP		"Enable Spandsp faxing support" off \
 		EXCHANGE	"Enable Exchange calendar support" off \
-		NEWG711		"Enable new G711 Codec" off
+		NEWG711		"Enable new G711 Codec" off	\
+		SRTP		"Enable SecureRTP support" off	\
+		LUA		"Enable LUA extensions support" off
 
 ASTERISK_USER?=		asterisk
 ASTERISK_GROUP?=	asterisk
@@ -257,6 +259,26 @@ PLIST_SUB+=	WITH_EXCHANGE=""
 EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-menuselect-tree-g711-new-codec.diff
 .endif
 
+.if !defined(WITH_SRTP)
+PLIST_SUB+=    WITH_SRTP="@comment "
+CONFIGURE_ARGS+=       --without-srtp
+.else
+PLIST_SUB+=    WITH_SRTP=""
+BUILD_DEPENDS+=        libsrtp>=1.4.4:${PORTSDIR}/net/libsrtp
+CONFIGURE_ARGS+=       --with-srtp
+.endif
+
+.if defined(WITH_LUA)
+CONFIGURE_ARGS+=	--with-lua
+CFLAGS+=	-I${LUA_INCDIR}
+USE_LUA=	yes
+LDFLAGS+=	-L${LUA_LIBDIR}
+PLIST_SUB+=	WITH_LUA=""
+.else
+CONFIGURE_ARGS+=	--without-lua
+PLIST_SUB+=	WITH_LUA="@comment "
+.endif
+
 .if defined(WITH_MISC_PATCHES)
 EXTRA_PATCHES+=	${PATCHDIR}/dtmf_debug.diff
 EXTRA_PATCHES+=	${PATCHDIR}/feature_disconnect.diff
diff --git a/net/asterisk/distinfo b/net/asterisk/distinfo
index 6f1b1f6ebf08..302d8bc1b6da 100644
--- a/net/asterisk/distinfo
+++ b/net/asterisk/distinfo
@@ -1,2 +1,2 @@
-SHA256 (asterisk-1.8.3.3.tar.gz) = 899399a5c5f089dc793d033f670f6c14e13447cf0830d9093d82873f4892da9b
-SIZE (asterisk-1.8.3.3.tar.gz) = 26871276
+SHA256 (asterisk-1.8.4.tar.gz) = 474404e0c85eac7e425d796936758aee9e959166dbdc15c9f391a1543deb205e
+SIZE (asterisk-1.8.4.tar.gz) = 27021108
diff --git a/net/asterisk/files/patch-Makefile b/net/asterisk/files/patch-Makefile
index 9dc24fa96ebe..28033ba65dca 100644
--- a/net/asterisk/files/patch-Makefile
+++ b/net/asterisk/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	2011-01-12 16:57:43.000000000 +0100
-+++ Makefile	2011-03-02 11:34:26.000000000 +0100
+--- Makefile.orig	2011-02-01 19:02:06.000000000 +0100
++++ Makefile	2011-05-10 20:05:28.666173614 +0200
 @@ -122,7 +122,7 @@
  OVERWRITE=y
  
@@ -32,29 +32,25 @@
    _ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
  endif
  
-@@ -463,13 +465,18 @@
+@@ -462,9 +464,14 @@
+ 		$(INSTALL) -m 644 $$x "$(DESTDIR)$(ASTDATADIR)/static-http" ; \
  	done
  	$(INSTALL) -m 644 doc/core-en_US.xml "$(DESTDIR)$(ASTDATADIR)/static-http";
- 	if [ -d doc/tex/asterisk ] ; then \
--		$(INSTALL) -d "$(DESTDIR)$(ASTDATADIR)/static-http/docs" ; \
-+		$(INSTALL) -d $(DESTDIR)$(DOCSDIR) ; \
-+		$(INSTALL) -d $(DESTDIR)$(DOCSDIR)/images ; \
- 		for n in doc/tex/asterisk/* ; do \
--			$(INSTALL) -m 644 $$n "$(DESTDIR)$(ASTDATADIR)/static-http/docs" ; \
-+			$(INSTALL) -m 644 $$n $(DESTDIR)$(DOCSDIR) ; \
- 		done \
- 	fi
+-	for x in images/*.jpg; do \
+-		$(INSTALL) -m 644 $$x "$(DESTDIR)$(ASTDATADIR)/images" ; \
+-	done
++
 +	if [ ! -d $(DESTDIR)$(DOCSDIR)/images ]; then \
 +		$(MKDIR) $(DESTDIR)$(DOCSDIR)/images; \
 +	fi
 +
- 	for x in images/*.jpg; do \
--		$(INSTALL) -m 644 $$x "$(DESTDIR)$(ASTDATADIR)/images" ; \
++	for x in images/*.jpg; do \
 +		$(INSTALL) -m 644 $$x $(DESTDIR)$(DOCSDIR)/images ; \
- 	done
++	done
  	$(MAKE) -C sounds install
  
-@@ -529,6 +536,7 @@
+ doc/core-en_US.xml: $(foreach dir,$(MOD_SUBDIRS),$(shell $(GREP) -l "language=\"en_US\"" $(dir)/*.c $(dir)/*.cc 2>/dev/null))
+@@ -523,6 +530,7 @@
  	$(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/dictate"
  	$(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/meetme"
  	$(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/monitor"
@@ -62,7 +58,7 @@
  	$(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/system"
  	$(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/tmp"
  	$(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/voicemail"
-@@ -550,6 +558,7 @@
+@@ -544,6 +552,7 @@
  	$(INSTALL) -d "$(DESTDIR)$(ASTDATADIR)/static-http"
  	$(INSTALL) -d "$(DESTDIR)$(ASTMANDIR)/man8"
  	$(INSTALL) -d "$(DESTDIR)$(AGI_DIR)"
@@ -70,7 +66,7 @@
  
  bininstall: _all installdirs $(SUBDIRS_INSTALL)
  	$(INSTALL) -m 755 main/asterisk $(DESTDIR)$(ASTSBINDIR)/
-@@ -609,7 +618,7 @@
+@@ -603,7 +612,7 @@
  	@exit 1
  endif
  
@@ -79,7 +75,7 @@
  	@if [ -x /usr/sbin/asterisk-post-install ]; then \
  		/usr/sbin/asterisk-post-install $(DESTDIR) . ; \
  	fi
-@@ -651,29 +660,18 @@
+@@ -645,29 +654,18 @@
  		else \
  			echo "Installing $$x" ; \
  		fi ; \
diff --git a/net/asterisk/files/patch-configure b/net/asterisk/files/patch-configure
index 7f9d1a6a71f1..a2c686eea5e6 100644
--- a/net/asterisk/files/patch-configure
+++ b/net/asterisk/files/patch-configure
@@ -1,14 +1,6 @@
---- configure.orig	2011-01-09 22:40:34.000000000 +0100
-+++ configure	2011-03-02 00:16:16.000000000 +0100
-@@ -600,7 +600,6 @@
- ac_default_prefix=/usr/local
- ac_default_prefix=/usr/local
- ac_default_prefix=/usr/local
--ac_default_prefix=/usr
- ac_header_list=
- ac_subst_vars='LTLIBOBJS
- PBX_SYSLOG
-@@ -4677,9 +4676,9 @@
+--- configure.orig	2011-01-27 18:03:01.000000000 +0100
++++ configure	2011-05-10 20:10:47.007174008 +0200
+@@ -4681,9 +4681,9 @@
  astheaderdir='${includedir}/asterisk'
  astlibdir='${libdir}/asterisk'
  astmandir='${mandir}'
@@ -20,17 +12,16 @@
  astkeydir='${astvarlibdir}'
  astspooldir='${localstatedir}/spool/asterisk'
  astlogdir='${localstatedir}/log/asterisk'
-@@ -4701,9 +4700,6 @@
- 
+@@ -4706,8 +4706,6 @@
  case "${host_os}" in
       freebsd*)
--
+      ac_default_prefix=/usr/local
 -     CPPFLAGS=-I/usr/local/include
 -     LDFLAGS=-L/usr/local/lib
       ;;
       openbsd*)
- 
-@@ -17558,6 +17554,8 @@
+      ac_default_prefix=/usr/local
+@@ -17540,6 +17538,8 @@
  
  	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
@@ -39,7 +30,7 @@
   #include <ifaddrs.h>
  int
  main ()
-@@ -25364,7 +25362,7 @@
+@@ -25290,7 +25290,7 @@
  
  	fi
  
diff --git a/net/asterisk/pkg-plist b/net/asterisk/pkg-plist
index 2b443070b0eb..e880a73c2744 100644
--- a/net/asterisk/pkg-plist
+++ b/net/asterisk/pkg-plist
@@ -471,6 +471,7 @@ lib/asterisk/modules/res_clialiases.so
 lib/asterisk/modules/res_limit.so
 lib/asterisk/modules/res_phoneprov.so
 lib/asterisk/modules/res_realtime.so
+%%WITH_SRTP%%lib/asterisk/modules/res_srtp.so
 %%WITH_DAHDI%%lib/asterisk/modules/res_timing_dahdi.so
 lib/asterisk/modules/res_timing_pthread.so
 lib/asterisk/modules/app_adsiprog.so
@@ -658,6 +659,7 @@ share/asterisk/phoneprov/000000000000-phone.cfg
 share/asterisk/phoneprov/000000000000.cfg
 share/asterisk/phoneprov/polycom.xml
 share/asterisk/phoneprov/polycom_line.xml
+share/asterisk/phoneprov/snom-mac.xml
 share/asterisk/sounds/en/CHANGES-asterisk-core-en-1.4.20
 share/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.20
 share/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.20
@@ -1132,6 +1134,7 @@ share/asterisk/static-http/mantest.html
 %%WITH_DAHDI%%lib/asterisk/modules/codec_dahdi.so
 %%WITH_ODBC%%lib/asterisk/modules/res_config_odbc.so
 %%WITH_ODBC%%lib/asterisk/modules/res_odbc.so
+%%WITH_LUA%%lib/asterisk/modules/pbx_lua.so
 %%DOCSDIR%%/images/asterisk-intro.jpg
 %%DOCSDIR%%/images/kpad2.jpg
 @dirrm %%DOCSDIR%%/images
diff --git a/net/asterisk10/Makefile b/net/asterisk10/Makefile
index 2f55bf32fcb5..4bd13166fcd9 100644
--- a/net/asterisk10/Makefile
+++ b/net/asterisk10/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	asterisk
-PORTVERSION=	1.8.3.3
+PORTVERSION=	1.8.4
 CATEGORIES=	net
 MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/asterisk/ \
 		http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/
@@ -60,7 +60,9 @@ OPTIONS=	OGGVORBIS	"Enable Ogg Vorbis support" on \
 		ILBC		"Enable iLBC codec" off \
 		SPANDSP		"Enable Spandsp faxing support" off \
 		EXCHANGE	"Enable Exchange calendar support" off \
-		NEWG711		"Enable new G711 Codec" off
+		NEWG711		"Enable new G711 Codec" off	\
+		SRTP		"Enable SecureRTP support" off	\
+		LUA		"Enable LUA extensions support" off
 
 ASTERISK_USER?=		asterisk
 ASTERISK_GROUP?=	asterisk
@@ -257,6 +259,26 @@ PLIST_SUB+=	WITH_EXCHANGE=""
 EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-menuselect-tree-g711-new-codec.diff
 .endif
 
+.if !defined(WITH_SRTP)
+PLIST_SUB+=    WITH_SRTP="@comment "
+CONFIGURE_ARGS+=       --without-srtp
+.else
+PLIST_SUB+=    WITH_SRTP=""
+BUILD_DEPENDS+=        libsrtp>=1.4.4:${PORTSDIR}/net/libsrtp
+CONFIGURE_ARGS+=       --with-srtp
+.endif
+
+.if defined(WITH_LUA)
+CONFIGURE_ARGS+=	--with-lua
+CFLAGS+=	-I${LUA_INCDIR}
+USE_LUA=	yes
+LDFLAGS+=	-L${LUA_LIBDIR}
+PLIST_SUB+=	WITH_LUA=""
+.else
+CONFIGURE_ARGS+=	--without-lua
+PLIST_SUB+=	WITH_LUA="@comment "
+.endif
+
 .if defined(WITH_MISC_PATCHES)
 EXTRA_PATCHES+=	${PATCHDIR}/dtmf_debug.diff
 EXTRA_PATCHES+=	${PATCHDIR}/feature_disconnect.diff
diff --git a/net/asterisk10/distinfo b/net/asterisk10/distinfo
index 6f1b1f6ebf08..302d8bc1b6da 100644
--- a/net/asterisk10/distinfo
+++ b/net/asterisk10/distinfo
@@ -1,2 +1,2 @@
-SHA256 (asterisk-1.8.3.3.tar.gz) = 899399a5c5f089dc793d033f670f6c14e13447cf0830d9093d82873f4892da9b
-SIZE (asterisk-1.8.3.3.tar.gz) = 26871276
+SHA256 (asterisk-1.8.4.tar.gz) = 474404e0c85eac7e425d796936758aee9e959166dbdc15c9f391a1543deb205e
+SIZE (asterisk-1.8.4.tar.gz) = 27021108
diff --git a/net/asterisk10/files/patch-Makefile b/net/asterisk10/files/patch-Makefile
index 9dc24fa96ebe..28033ba65dca 100644
--- a/net/asterisk10/files/patch-Makefile
+++ b/net/asterisk10/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	2011-01-12 16:57:43.000000000 +0100
-+++ Makefile	2011-03-02 11:34:26.000000000 +0100
+--- Makefile.orig	2011-02-01 19:02:06.000000000 +0100
++++ Makefile	2011-05-10 20:05:28.666173614 +0200
 @@ -122,7 +122,7 @@
  OVERWRITE=y
  
@@ -32,29 +32,25 @@
    _ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
  endif
  
-@@ -463,13 +465,18 @@
+@@ -462,9 +464,14 @@
+ 		$(INSTALL) -m 644 $$x "$(DESTDIR)$(ASTDATADIR)/static-http" ; \
  	done
  	$(INSTALL) -m 644 doc/core-en_US.xml "$(DESTDIR)$(ASTDATADIR)/static-http";
- 	if [ -d doc/tex/asterisk ] ; then \
--		$(INSTALL) -d "$(DESTDIR)$(ASTDATADIR)/static-http/docs" ; \
-+		$(INSTALL) -d $(DESTDIR)$(DOCSDIR) ; \
-+		$(INSTALL) -d $(DESTDIR)$(DOCSDIR)/images ; \
- 		for n in doc/tex/asterisk/* ; do \
--			$(INSTALL) -m 644 $$n "$(DESTDIR)$(ASTDATADIR)/static-http/docs" ; \
-+			$(INSTALL) -m 644 $$n $(DESTDIR)$(DOCSDIR) ; \
- 		done \
- 	fi
+-	for x in images/*.jpg; do \
+-		$(INSTALL) -m 644 $$x "$(DESTDIR)$(ASTDATADIR)/images" ; \
+-	done
++
 +	if [ ! -d $(DESTDIR)$(DOCSDIR)/images ]; then \
 +		$(MKDIR) $(DESTDIR)$(DOCSDIR)/images; \
 +	fi
 +
- 	for x in images/*.jpg; do \
--		$(INSTALL) -m 644 $$x "$(DESTDIR)$(ASTDATADIR)/images" ; \
++	for x in images/*.jpg; do \
 +		$(INSTALL) -m 644 $$x $(DESTDIR)$(DOCSDIR)/images ; \
- 	done
++	done
  	$(MAKE) -C sounds install
  
-@@ -529,6 +536,7 @@
+ doc/core-en_US.xml: $(foreach dir,$(MOD_SUBDIRS),$(shell $(GREP) -l "language=\"en_US\"" $(dir)/*.c $(dir)/*.cc 2>/dev/null))
+@@ -523,6 +530,7 @@
  	$(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/dictate"
  	$(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/meetme"
  	$(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/monitor"
@@ -62,7 +58,7 @@
  	$(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/system"
  	$(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/tmp"
  	$(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/voicemail"
-@@ -550,6 +558,7 @@
+@@ -544,6 +552,7 @@
  	$(INSTALL) -d "$(DESTDIR)$(ASTDATADIR)/static-http"
  	$(INSTALL) -d "$(DESTDIR)$(ASTMANDIR)/man8"
  	$(INSTALL) -d "$(DESTDIR)$(AGI_DIR)"
@@ -70,7 +66,7 @@
  
  bininstall: _all installdirs $(SUBDIRS_INSTALL)
  	$(INSTALL) -m 755 main/asterisk $(DESTDIR)$(ASTSBINDIR)/
-@@ -609,7 +618,7 @@
+@@ -603,7 +612,7 @@
  	@exit 1
  endif
  
@@ -79,7 +75,7 @@
  	@if [ -x /usr/sbin/asterisk-post-install ]; then \
  		/usr/sbin/asterisk-post-install $(DESTDIR) . ; \
  	fi
-@@ -651,29 +660,18 @@
+@@ -645,29 +654,18 @@
  		else \
  			echo "Installing $$x" ; \
  		fi ; \
diff --git a/net/asterisk10/files/patch-configure b/net/asterisk10/files/patch-configure
index 7f9d1a6a71f1..a2c686eea5e6 100644
--- a/net/asterisk10/files/patch-configure
+++ b/net/asterisk10/files/patch-configure
@@ -1,14 +1,6 @@
---- configure.orig	2011-01-09 22:40:34.000000000 +0100
-+++ configure	2011-03-02 00:16:16.000000000 +0100
-@@ -600,7 +600,6 @@
- ac_default_prefix=/usr/local
- ac_default_prefix=/usr/local
- ac_default_prefix=/usr/local
--ac_default_prefix=/usr
- ac_header_list=
- ac_subst_vars='LTLIBOBJS
- PBX_SYSLOG
-@@ -4677,9 +4676,9 @@
+--- configure.orig	2011-01-27 18:03:01.000000000 +0100
++++ configure	2011-05-10 20:10:47.007174008 +0200
+@@ -4681,9 +4681,9 @@
  astheaderdir='${includedir}/asterisk'
  astlibdir='${libdir}/asterisk'
  astmandir='${mandir}'
@@ -20,17 +12,16 @@
  astkeydir='${astvarlibdir}'
  astspooldir='${localstatedir}/spool/asterisk'
  astlogdir='${localstatedir}/log/asterisk'
-@@ -4701,9 +4700,6 @@
- 
+@@ -4706,8 +4706,6 @@
  case "${host_os}" in
       freebsd*)
--
+      ac_default_prefix=/usr/local
 -     CPPFLAGS=-I/usr/local/include
 -     LDFLAGS=-L/usr/local/lib
       ;;
       openbsd*)
- 
-@@ -17558,6 +17554,8 @@
+      ac_default_prefix=/usr/local
+@@ -17540,6 +17538,8 @@
  
  	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
@@ -39,7 +30,7 @@
   #include <ifaddrs.h>
  int
  main ()
-@@ -25364,7 +25362,7 @@
+@@ -25290,7 +25290,7 @@
  
  	fi
  
diff --git a/net/asterisk10/pkg-plist b/net/asterisk10/pkg-plist
index 2b443070b0eb..e880a73c2744 100644
--- a/net/asterisk10/pkg-plist
+++ b/net/asterisk10/pkg-plist
@@ -471,6 +471,7 @@ lib/asterisk/modules/res_clialiases.so
 lib/asterisk/modules/res_limit.so
 lib/asterisk/modules/res_phoneprov.so
 lib/asterisk/modules/res_realtime.so
+%%WITH_SRTP%%lib/asterisk/modules/res_srtp.so
 %%WITH_DAHDI%%lib/asterisk/modules/res_timing_dahdi.so
 lib/asterisk/modules/res_timing_pthread.so
 lib/asterisk/modules/app_adsiprog.so
@@ -658,6 +659,7 @@ share/asterisk/phoneprov/000000000000-phone.cfg
 share/asterisk/phoneprov/000000000000.cfg
 share/asterisk/phoneprov/polycom.xml
 share/asterisk/phoneprov/polycom_line.xml
+share/asterisk/phoneprov/snom-mac.xml
 share/asterisk/sounds/en/CHANGES-asterisk-core-en-1.4.20
 share/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.20
 share/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.20
@@ -1132,6 +1134,7 @@ share/asterisk/static-http/mantest.html
 %%WITH_DAHDI%%lib/asterisk/modules/codec_dahdi.so
 %%WITH_ODBC%%lib/asterisk/modules/res_config_odbc.so
 %%WITH_ODBC%%lib/asterisk/modules/res_odbc.so
+%%WITH_LUA%%lib/asterisk/modules/pbx_lua.so
 %%DOCSDIR%%/images/asterisk-intro.jpg
 %%DOCSDIR%%/images/kpad2.jpg
 @dirrm %%DOCSDIR%%/images