o Provide rc.d script;

o Fix build on 5.2.1.

Submitted by:	Marat N.Afanasyev <amarat@ksu.ru>

4 files changed, 68 insertions, 0 deletions

diff --git a/net/asterisk-devel/Makefile b/net/asterisk-devel/Makefile
index f82e980a1a74..97b6dcea0d10 100644
--- a/net/asterisk-devel/Makefile
+++ b/net/asterisk-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	asterisk
 PORTVERSION=	1.0.2
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.asterisk.org/pub/telephony/asterisk/ \
 		ftp://ftp.asterisk.org/pub/telephony/asterisk/old-releases/
@@ -24,6 +25,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_WRKSRC=	${WRKSRC}/editline
 USE_GMAKE=	yes
 USE_BISON=	yes
+USE_RC_SUBR=	yes
 MAKE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}" \
 		MKDIR="${MKDIR}" \
@@ -59,4 +61,7 @@ RUN_DEPENDS+=	${LOCALBASE}/include/zaptel.h:${PORTSDIR}/misc/zaptel
 PLIST_SUB+=	WITH_ZAPTEL=""
 .endif
 
+post-install:
+	@${INSTALL_SCRIPT} ${FILESDIR}/asterisk.sh ${PREFIX}/etc/rc.d
+
 .include <bsd.port.post.mk>
diff --git a/net/asterisk-devel/files/asterisk.sh b/net/asterisk-devel/files/asterisk.sh
new file mode 100644
index 000000000000..deee10c0cbe4
--- /dev/null
+++ b/net/asterisk-devel/files/asterisk.sh
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+# PROVIDE asterisk
+# REQUIRE: NETWORKING SERVERS
+# BEFORE: DAEMON
+# KEYWORD: FreeBSD shutdown
+
+#
+# Add the following lines to /etc/rc.conf to enable asterisk:
+#
+# asterisk_enable="YES"
+#
+
+. /etc/rc.subr
+
+name=asterisk
+rcvar=`set_rcvar`
+
+command=/usr/local/sbin/asterisk
+pidfile=/var/run/asterisk.pid
+
+asterisk_enable=${asterisk_enable:-"NO"}
+
+load_rc_config $name
+run_rc_command "$1"
diff --git a/net/asterisk-devel/files/patch-channels::h323::ast_h323.cpp b/net/asterisk-devel/files/patch-channels::h323::ast_h323.cpp
new file mode 100644
index 000000000000..6cfae1ec5d05
--- /dev/null
+++ b/net/asterisk-devel/files/patch-channels::h323::ast_h323.cpp
@@ -0,0 +1,37 @@
+
+$FreeBSD$
+
+--- channels/h323/ast_h323.cpp.orig
++++ channels/h323/ast_h323.cpp
+@@ -722,7 +722,7 @@
+ 	if (h323debug) {
+ 		cout << "	-- Sending user input tone (" << tone << ") to remote" << endl;
+ 	}
+-	on_send_digit(GetCallReference(), tone);	
++	on_send_digit(GetCallReference(), &tone);	
+ 	H323Connection::SendUserInputTone(tone, duration);
+ }
+ 
+@@ -732,18 +732,20 @@
+ 		if (h323debug) {
+ 			cout << "	-- Received user input tone (" << tone << ") from remote" << endl;
+ 		}
+-		on_send_digit(GetCallReference(), tone);
++		on_send_digit(GetCallReference(), &tone);
+ 	}
+ 	H323Connection::OnUserInputTone(tone, duration, logicalChannel, rtpTimestamp);
+ }
+ 
+ void MyH323Connection::OnUserInputString(const PString &value)
+ {
++	char val;
+ 	if (mode == H323_DTMF_RFC2833) {
+ 		if (h323debug) {
+ 			cout <<  "	-- Received user input string (" << value << ") from remote." << endl;
+ 		}
+-		on_send_digit(GetCallReference(), value[0]);
++		val = value[0];
++		on_send_digit(GetCallReference(), &val);
+ 	}	
+ }
+ 
diff --git a/net/asterisk-devel/pkg-plist b/net/asterisk-devel/pkg-plist
index a5a1722f8d7e..d503a8741743 100644
--- a/net/asterisk-devel/pkg-plist
+++ b/net/asterisk-devel/pkg-plist
@@ -124,6 +124,7 @@ etc/asterisk/vpb.conf-dist
 @unexec if cmp -s %D/etc/asterisk/zapata.conf %D/etc/asterisk/zapata.conf-dist; then rm -f %D/etc/asterisk/zapata.conf; fi
 etc/asterisk/zapata.conf-dist
 @exec [ -f %B/zapata.conf ] || cp %B/%f %B/zapata.conf
+etc/rc.d/asterisk.sh
 include/asterisk/acl.h
 include/asterisk/adsi.h
 include/asterisk/aes.h