aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsobomax <sobomax@FreeBSD.org>2004-12-29 08:01:54 +0800
committersobomax <sobomax@FreeBSD.org>2004-12-29 08:01:54 +0800
commit8ccd39fdbf8f3d136ffd7295f390e5a915d909a5 (patch)
tree3ebefc2fb8b43ef01a2125141b3fcd9d4d2ba74e
parent255ebf4e7626ddf13df60a44f13a987b364ade65 (diff)
downloadfreebsd-ports-gnome-8ccd39fdbf8f3d136ffd7295f390e5a915d909a5.tar.gz
freebsd-ports-gnome-8ccd39fdbf8f3d136ffd7295f390e5a915d909a5.tar.zst
freebsd-ports-gnome-8ccd39fdbf8f3d136ffd7295f390e5a915d909a5.zip
o Provide rc.d script;
o Fix build on 5.2.1. Submitted by: Marat N.Afanasyev <amarat@ksu.ru>
-rw-r--r--net/asterisk-bristuff/Makefile5
-rw-r--r--net/asterisk-bristuff/files/asterisk.sh25
-rw-r--r--net/asterisk-bristuff/files/patch-channels::h323::ast_h323.cpp37
-rw-r--r--net/asterisk-bristuff/pkg-plist1
-rw-r--r--net/asterisk-devel/Makefile5
-rw-r--r--net/asterisk-devel/files/asterisk.sh25
-rw-r--r--net/asterisk-devel/files/patch-channels::h323::ast_h323.cpp37
-rw-r--r--net/asterisk-devel/pkg-plist1
-rw-r--r--net/asterisk/Makefile5
-rw-r--r--net/asterisk/files/asterisk.sh25
-rw-r--r--net/asterisk/files/patch-channels::h323::ast_h323.cpp37
-rw-r--r--net/asterisk/pkg-plist1
-rw-r--r--net/asterisk10/Makefile5
-rw-r--r--net/asterisk10/files/asterisk.sh25
-rw-r--r--net/asterisk10/files/patch-channels::h323::ast_h323.cpp37
-rw-r--r--net/asterisk10/pkg-plist1
-rw-r--r--net/asterisk12/Makefile5
-rw-r--r--net/asterisk12/files/asterisk.sh25
-rw-r--r--net/asterisk12/files/patch-channels::h323::ast_h323.cpp37
-rw-r--r--net/asterisk12/pkg-plist1
-rw-r--r--net/asterisk14/Makefile5
-rw-r--r--net/asterisk14/files/asterisk.sh25
-rw-r--r--net/asterisk14/files/patch-channels::h323::ast_h323.cpp37
-rw-r--r--net/asterisk14/pkg-plist1
-rw-r--r--net/asterisk16/Makefile5
-rw-r--r--net/asterisk16/files/asterisk.sh25
-rw-r--r--net/asterisk16/files/patch-channels::h323::ast_h323.cpp37
-rw-r--r--net/asterisk16/pkg-plist1
28 files changed, 476 insertions, 0 deletions
diff --git a/net/asterisk-bristuff/Makefile b/net/asterisk-bristuff/Makefile
index f82e980a1a74..97b6dcea0d10 100644
--- a/net/asterisk-bristuff/Makefile
+++ b/net/asterisk-bristuff/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-bristuff/files/asterisk.sh b/net/asterisk-bristuff/files/asterisk.sh
new file mode 100644
index 000000000000..deee10c0cbe4
--- /dev/null
+++ b/net/asterisk-bristuff/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-bristuff/files/patch-channels::h323::ast_h323.cpp b/net/asterisk-bristuff/files/patch-channels::h323::ast_h323.cpp
new file mode 100644
index 000000000000..6cfae1ec5d05
--- /dev/null
+++ b/net/asterisk-bristuff/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-bristuff/pkg-plist b/net/asterisk-bristuff/pkg-plist
index a5a1722f8d7e..d503a8741743 100644
--- a/net/asterisk-bristuff/pkg-plist
+++ b/net/asterisk-bristuff/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
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
diff --git a/net/asterisk/Makefile b/net/asterisk/Makefile
index f82e980a1a74..97b6dcea0d10 100644
--- a/net/asterisk/Makefile
+++ b/net/asterisk/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/files/asterisk.sh b/net/asterisk/files/asterisk.sh
new file mode 100644
index 000000000000..deee10c0cbe4
--- /dev/null
+++ b/net/asterisk/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/files/patch-channels::h323::ast_h323.cpp b/net/asterisk/files/patch-channels::h323::ast_h323.cpp
new file mode 100644
index 000000000000..6cfae1ec5d05
--- /dev/null
+++ b/net/asterisk/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/pkg-plist b/net/asterisk/pkg-plist
index a5a1722f8d7e..d503a8741743 100644
--- a/net/asterisk/pkg-plist
+++ b/net/asterisk/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
diff --git a/net/asterisk10/Makefile b/net/asterisk10/Makefile
index f82e980a1a74..97b6dcea0d10 100644
--- a/net/asterisk10/Makefile
+++ b/net/asterisk10/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/asterisk10/files/asterisk.sh b/net/asterisk10/files/asterisk.sh
new file mode 100644
index 000000000000..deee10c0cbe4
--- /dev/null
+++ b/net/asterisk10/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/asterisk10/files/patch-channels::h323::ast_h323.cpp b/net/asterisk10/files/patch-channels::h323::ast_h323.cpp
new file mode 100644
index 000000000000..6cfae1ec5d05
--- /dev/null
+++ b/net/asterisk10/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/asterisk10/pkg-plist b/net/asterisk10/pkg-plist
index a5a1722f8d7e..d503a8741743 100644
--- a/net/asterisk10/pkg-plist
+++ b/net/asterisk10/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
diff --git a/net/asterisk12/Makefile b/net/asterisk12/Makefile
index f82e980a1a74..97b6dcea0d10 100644
--- a/net/asterisk12/Makefile
+++ b/net/asterisk12/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/asterisk12/files/asterisk.sh b/net/asterisk12/files/asterisk.sh
new file mode 100644
index 000000000000..deee10c0cbe4
--- /dev/null
+++ b/net/asterisk12/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/asterisk12/files/patch-channels::h323::ast_h323.cpp b/net/asterisk12/files/patch-channels::h323::ast_h323.cpp
new file mode 100644
index 000000000000..6cfae1ec5d05
--- /dev/null
+++ b/net/asterisk12/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/asterisk12/pkg-plist b/net/asterisk12/pkg-plist
index a5a1722f8d7e..d503a8741743 100644
--- a/net/asterisk12/pkg-plist
+++ b/net/asterisk12/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
diff --git a/net/asterisk14/Makefile b/net/asterisk14/Makefile
index f82e980a1a74..97b6dcea0d10 100644
--- a/net/asterisk14/Makefile
+++ b/net/asterisk14/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/asterisk14/files/asterisk.sh b/net/asterisk14/files/asterisk.sh
new file mode 100644
index 000000000000..deee10c0cbe4
--- /dev/null
+++ b/net/asterisk14/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/asterisk14/files/patch-channels::h323::ast_h323.cpp b/net/asterisk14/files/patch-channels::h323::ast_h323.cpp
new file mode 100644
index 000000000000..6cfae1ec5d05
--- /dev/null
+++ b/net/asterisk14/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/asterisk14/pkg-plist b/net/asterisk14/pkg-plist
index a5a1722f8d7e..d503a8741743 100644
--- a/net/asterisk14/pkg-plist
+++ b/net/asterisk14/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
diff --git a/net/asterisk16/Makefile b/net/asterisk16/Makefile
index f82e980a1a74..97b6dcea0d10 100644
--- a/net/asterisk16/Makefile
+++ b/net/asterisk16/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/asterisk16/files/asterisk.sh b/net/asterisk16/files/asterisk.sh
new file mode 100644
index 000000000000..deee10c0cbe4
--- /dev/null
+++ b/net/asterisk16/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/asterisk16/files/patch-channels::h323::ast_h323.cpp b/net/asterisk16/files/patch-channels::h323::ast_h323.cpp
new file mode 100644
index 000000000000..6cfae1ec5d05
--- /dev/null
+++ b/net/asterisk16/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/asterisk16/pkg-plist b/net/asterisk16/pkg-plist
index a5a1722f8d7e..d503a8741743 100644
--- a/net/asterisk16/pkg-plist
+++ b/net/asterisk16/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