here's a preliminary diff if anyone's interested in playing with
asterisk's 1.8 branch. it's not finished yet. at this point i'm
more interested to know how it works for people rather than details
about the port itself.
note that this version includes Viagenie's IPv6 support (in
the socket layers and sip channel). see UPGRADE.txt for details of
what else has changed with this version (including some changes
that may require config changes).
Index: Makefile
===================================================================
RCS file: /cvs/ports/telephony/asterisk/Makefile,v
retrieving revision 1.92
diff -u -p -r1.92 Makefile
--- Makefile 27 Aug 2010 00:48:19 -0000 1.92
+++ Makefile 11 Sep 2010 20:24:56 -0000
@@ -3,12 +3,15 @@
SHARED_ONLY= Yes
COMMENT-main= open source multi-protocol PBX and telephony toolkit
-VER= 1.6.2.11
-REVISION-main= 0
-CORESOUNDS= 1.4.19
-DISTNAME= asterisk-${VER:S/rc/-rc/}
+VER= 1.8.0beta5
+DISTNAME= asterisk-${VER:S/beta/-beta/}
PKGNAME-main= asterisk-${VER}
+SOUNDS= CORE MOH #EXTRA
+SOUNDS_CORE= asterisk-core-sounds-en-gsm-1.4.19
+SOUNDS_MOH= asterisk-moh-opsound-wav-2.03
+#?SOUNDS_EXTRA= asterisk-extra-sounds-en-gsm-1.4.11
+
CATEGORIES= telephony
HOMEPAGE= http://www.asterisk.org/
@@ -23,29 +26,43 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-MULTI_PACKAGES+= -main
-SUBST_VARS+= CORESOUNDS
+WANTLIB-main += c crypto curl execinfo gsm iconv idn iksemel
+WANTLIB-main += m ogg pthread spandsp sqlite3 ssl stdc++ termcap
+WANTLIB-main += tiff vorbis vorbisenc xml2 z
-WANTLIB-main += c crypto execinfo gsm iconv m ogg popt pthread
-WANTLIB-main += sqlite3 ssl stdc++ termcap vorbis vorbisenc xml2 z
+MODULES= devel/gettext # only used for -calendar
+MULTI_PACKAGES+= -main
+SUBST_VARS+= ${SOUNDS:S/^/SOUNDS_/}
LIB_DEPENDS-main= ::audio/gsm \
::audio/libogg \
::audio/libvorbis \
- ::textproc/libxml \
::databases/sqlite3 \
::devel/libexecinfo \
- ::devel/popt
+ ::graphics/tiff \
+ ::net/curl \
+ ::telephony/spandsp \
+ ::textproc/iksemel \
+ ::textproc/libxml
MASTER_SITES= http://downloads.digium.com/pub/telephony/asterisk/releases/ \
http://downloads.digium.com/pub/telephony/asterisk/old-releases/
+MASTER_SITES0= ${MASTER_SITES:C/asterisk/sounds/}
+
+EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
+.for i in ${SOUNDS}
+SVER_$i = ${SOUNDS_$i:C/^[-a-z]*//}
+SUBST_VARS+= SVER_$i
+DISTFILES+= ${SOUNDS_$i}${EXTRACT_SUFX}:0 ${SOUNDS_$i}${EXTRACT_SUFX}.sha1:0
+.endfor
USE_GMAKE= Yes
USE_LIBTOOL= Yes
CONFIGURE_STYLE= gnu
-AUTOCONF_VERSION= 2.63
-AUTOMAKE_VERSION= 1.9
+AUTOCONF_VERSION= 2.64 # XXX 2.65 adds _'s with our m4
+AUTOMAKE_VERSION= 1.10
BUILD_DEPENDS+= ${MODGNU_AUTOCONF_DEPENDS} \
${MODGNU_AUTOMAKE_DEPENDS}
@@ -66,7 +83,6 @@ CONFIGURE_ARGS+= --with-asound=no \
--with-avcodec=no \
--with-cap=no \
--with-dahdi=no \
- --with-gtk=no \
--with-gtk2=no \
--with-gmime=no \
--with-isdnnet=no \
@@ -96,18 +112,67 @@ CONFIGURE_ARGS+= --with-jack=no \
# Some build options (including a useful malloc debug) are available
# via menuselect. They may be enabled by running 'make configure', cd
-# to WRKSRC, 'gmake menuselect', then cd back to the port directory
+# to WRKSRC, 'gmake menuselect', then 'cd -' back to the port directory
# and 'make'.
FLAVOR?=
-FLAVORS= h323
+FLAVORS= h323 imap
-# If using IMAP_STORAGE for voicemail, use this to pick up c-client.
-# Needs to be a flavour, {FILE,ODBC,IMAP}_STORAGE are mutually exclusive.
-#CONFIGURE_ARGS+= --with-imap=system
-#CPPFLAGS+= -I${LOCALBASE}/include/c-client
-#LIB_DEPENDS-main= ::mail/imap-uw,-c-client
-#WANTLIB-main+= c-client
+## flavours:
+
+.if ${FLAVOR:L:Mh323}
+LIB_DEPENDS-main+= ::net/h323plus
+WANTLIB-main+= SDL avutil expat h323.>=3 lber ldap ldap_r pt.>=3 sasl2
+.else
+CONFIGURE_ARGS+= --with-pwlib=no \
+ --with-h323=no
+.endif
+
+.if ${FLAVOR:L:Mimap}
+# does this work? XXX
+CONFIGURE_ARGS+= --with-imap=system
+CPPFLAGS+= -I${LOCALBASE}/include/c-client
+LIB_DEPENDS-main+= ::mail/imap-uw,-c-client
+WANTLIB-main+= c-client
+.endif
+
+## multipackages:
+
+# calendar
+PSEUDO_FLAVORS+= no_calendar
+.if ${FLAVOR:L:Mno_calendar}
+CONFIGURE_ARGS+= --with-ical=no
+.else
+MULTI_PACKAGES+= -calendar
+COMMENT-calendar= calendar support for Asterisk
+WANTLIB-calendar= ${MODGETTEXT_WANTLIB} asn1 crypto expat gssapi \
+ ical iksemel krb5 m neon ssl xml2 z
+LIB_DEPENDS-calendar= ::net/neon \
+ ::textproc/libical \
+ ${MODGETTEXT_LIB_DEPENDS}
+.endif
+
+# ldap
+PSEUDO_FLAVORS+= no_ldap
+.if ${FLAVOR:L:Mno_ldap}
+CONFIGURE_ARGS+= --with-ldap=no
+.else
+MULTI_PACKAGES+= -ldap
+COMMENT-ldap= LDAP support for Asterisk
+LIB_DEPENDS-ldap= ::databases/openldap,-main
+WANTLIB-ldap= ldap
+.endif
+
+# mysql need to handle building addons/ first
XXX
+#PSEUDO_FLAVORS+= no_mysql
+#.if ${FLAVOR:L:Mno_mysql}
+#CONFIGURE_ARGS+= --with-mysqlclient=no
+#.else
+#MULTI_PACKAGES+= -mysql
+#COMMENT-mysql= MySQL support for Asterisk
+#WANTLIB-mysql= mysqlclient
+#LIB_DEPENDS-mysql= ::databases/mysql
+#.endif
# odbc
PSEUDO_FLAVORS+= no_odbc
@@ -121,6 +186,17 @@ LIB_DEPENDS-odbc= ::databases/iodbc
WANTLIB-odbc= iodbc
.endif
+# postgresql
+PSEUDO_FLAVORS+= no_pgsql
+.if ${FLAVOR:L:Mno_pgsql}
+CONFIGURE_ARGS+= --with-postgres=no
+.else
+MULTI_PACKAGES+= -pgsql
+COMMENT-pgsql= PostgreSQL support for Asterisk
+WANTLIB-pgsql= pq z
+LIB_DEPENDS-pgsql= ::databases/postgresql
+.endif
+
# snmp
PSEUDO_FLAVORS+= no_snmp
.if ${FLAVOR:L:Mno_snmp}
@@ -143,70 +219,6 @@ WANTLIB-speex= m speex speexdsp
LIB_DEPENDS-speex= :speex->=1.2rc1:audio/speex
.endif
-# curl
-PSEUDO_FLAVORS+= no_curl
-.if ${FLAVOR:L:Mno_curl}
-CONFIGURE_ARGS+= --with-curl=no
-.else
-MULTI_PACKAGES+= -curl
-COMMENT-curl= libCURL support for Asterisk
-WANTLIB-curl= curl crypto idn ssl z
-LIB_DEPENDS-curl= ::net/curl
-.endif
-
-# postgresql
-PSEUDO_FLAVORS+= no_pgsql
-.if ${FLAVOR:L:Mno_pgsql}
-CONFIGURE_ARGS+= --with-postgres=no
-.else
-MULTI_PACKAGES+= -pgsql
-COMMENT-pgsql= PostgreSQL support for Asterisk
-WANTLIB-pgsql= pq z
-LIB_DEPENDS-pgsql= ::databases/postgresql
-.endif
-
-# jabber
-PSEUDO_FLAVORS+= no_jabber
-.if ${FLAVOR:L:Mno_jabber}
-CONFIGURE_ARGS+= --with-iksemel=no
-.else
-MULTI_PACKAGES+= -jabber
-COMMENT-jabber= Jabber support for Asterisk
-LIB_DEPENDS-jabber= ::textproc/iksemel
-WANTLIB-jabber= crypto iksemel ssl
-.endif
-
-# h323
-.if ${FLAVOR:L:Mh323}
-LIB_DEPENDS-main+= ::net/h323plus
-WANTLIB-main+= SDL avutil expat h323.>=3 lber ldap ldap_r pt.>=3 sasl2
-.else
-CONFIGURE_ARGS+= --with-pwlib=no \
- --with-h323=no
-.endif
-
-# ldap
-PSEUDO_FLAVORS+= no_ldap
-.if ${FLAVOR:L:Mno_ldap}
-CONFIGURE_ARGS+= --with-ldap=no
-.else
-MULTI_PACKAGES+= -ldap
-COMMENT-ldap= LDAP support for Asterisk
-LIB_DEPENDS-ldap= ::databases/openldap,-main
-WANTLIB-ldap= ldap
-.endif
-
-# fax
-PSEUDO_FLAVORS+= no_fax
-.if ${FLAVOR:L:Mno_fax}
-CONFIGURE_ARGS+= --with-spandsp=no
-.else
-MULTI_PACKAGES+= -fax
-COMMENT-fax= FAX support for Asterisk
-LIB_DEPENDS-fax= ::telephony/spandsp \
- ::graphics/tiff
-WANTLIB-fax= spandsp tiff
-.endif
NO_REGRESS= Yes
INSTALL_TARGET= install samples
@@ -229,6 +241,10 @@ pre-configure:
${WRKSRC}/doc/tex/asterisk/*
post-patch:
+ @grep _VERSION:= ${WRKSRC}/sounds/Makefile # maintainer aid
+.for i in ${SOUNDS}
+ @echo ${SOUNDS_$i}
+.endfor
cd ${WRKSRC}; \
AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
AUTOCONF_VERSION=${AUTOCONF_VERSION} \
Index: distinfo
===================================================================
RCS file: /cvs/ports/telephony/asterisk/distinfo,v
retrieving revision 1.60
diff -u -p -r1.60 distinfo
--- distinfo 17 Aug 2010 19:53:01 -0000 1.60
+++ distinfo 11 Sep 2010 20:24:56 -0000
@@ -1,5 +1,25 @@
-MD5 (asterisk-1.6.2.11.tar.gz) = LWdXoDVM/4fJ4Xdq2gd6rg==
-RMD160 (asterisk-1.6.2.11.tar.gz) = wTCw91qyfAkFOBN/+3CFmC/Lq/c=
-SHA1 (asterisk-1.6.2.11.tar.gz) = SGoszXk0/F6rYzGVMzKtfytEwtQ=
-SHA256 (asterisk-1.6.2.11.tar.gz) =
W4S3VvM6H5KJmpaPrJwoBsrdRV7tLg/mx9TzcnY28bQ=
-SIZE (asterisk-1.6.2.11.tar.gz) = 23695731
+MD5 (asterisk-1.8.0-beta5.tar.gz) = kCJ0/Cf1f/bwnvG5mQysHA==
+MD5 (asterisk-core-sounds-en-gsm-1.4.19.tar.gz) = 5tTRH35oggUN+5LzQRQTvA==
+MD5 (asterisk-core-sounds-en-gsm-1.4.19.tar.gz.sha1) = sPFun6juBsiAC0Z/aXxozg==
+MD5 (asterisk-moh-opsound-wav-2.03.tar.gz) = gnfixpP9BWdzscFeTVIHfQ==
+MD5 (asterisk-moh-opsound-wav-2.03.tar.gz.sha1) = AR+k3J/jXcPTTtVXuwQmPw==
+RMD160 (asterisk-1.8.0-beta5.tar.gz) = x2RdV7abKUbs7vLKrz7e4l7/a9Y=
+RMD160 (asterisk-core-sounds-en-gsm-1.4.19.tar.gz) =
l0DqLiLfuBmwUougq1tbZCQDlEI=
+RMD160 (asterisk-core-sounds-en-gsm-1.4.19.tar.gz.sha1) =
xjBwz+GuyLjXRJp8JsLOK5GBPbE=
+RMD160 (asterisk-moh-opsound-wav-2.03.tar.gz) = lWaXSoNgUeCPUUEt5QjZK/O+fgI=
+RMD160 (asterisk-moh-opsound-wav-2.03.tar.gz.sha1) =
D+hFjrIugSleLHkzLWEgvA7kjfM=
+SHA1 (asterisk-1.8.0-beta5.tar.gz) = wJxgSngRd/O9eg5i6Bq3FW1Kniw=
+SHA1 (asterisk-core-sounds-en-gsm-1.4.19.tar.gz) = cZ/ucmklFPuWoMYZ7RprnKv7UJg=
+SHA1 (asterisk-core-sounds-en-gsm-1.4.19.tar.gz.sha1) =
i85MpfxKTTo2R3htulYKH2p1ksA=
+SHA1 (asterisk-moh-opsound-wav-2.03.tar.gz) = 9A/W6gPf6Ncq2iVAsiiL/cAGOB0=
+SHA1 (asterisk-moh-opsound-wav-2.03.tar.gz.sha1) = y7b1cl1V/jLKmqKzM+N9YSXQ9Ec=
+SHA256 (asterisk-1.8.0-beta5.tar.gz) =
a7Dg8jlmBRWXBxvkAVicEjZ2QOviR068FN03kEy3kbY=
+SHA256 (asterisk-core-sounds-en-gsm-1.4.19.tar.gz) =
rWMbSg4VRoPWq+mi9i5b0Jn+wIhunLjAATo3G6w++Rk=
+SHA256 (asterisk-core-sounds-en-gsm-1.4.19.tar.gz.sha1) =
4U4YP76OVXwlFNplqPxnYA+O98h92L+LUkrrzapsORs=
+SHA256 (asterisk-moh-opsound-wav-2.03.tar.gz) =
RJ+4ENFlAsMFL+3wL353s2IGrFoUXz2s9Bd4Q6L8tTg=
+SHA256 (asterisk-moh-opsound-wav-2.03.tar.gz.sha1) =
Y8VUFsoRQmGrGvT9EVIyLy7GnZGrw0vEzufTKByuDZc=
+SIZE (asterisk-1.8.0-beta5.tar.gz) = 25656479
+SIZE (asterisk-core-sounds-en-gsm-1.4.19.tar.gz) = 1784830
+SIZE (asterisk-core-sounds-en-gsm-1.4.19.tar.gz.sha1) = 84
+SIZE (asterisk-moh-opsound-wav-2.03.tar.gz) = 15359473
+SIZE (asterisk-moh-opsound-wav-2.03.tar.gz.sha1) = 79
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/telephony/asterisk/patches/patch-Makefile,v
retrieving revision 1.29
diff -u -p -r1.29 patch-Makefile
--- patches/patch-Makefile 27 Aug 2010 00:48:19 -0000 1.29
+++ patches/patch-Makefile 11 Sep 2010 20:24:56 -0000
@@ -1,16 +1,17 @@
-$OpenBSD: patch-Makefile,v 1.29 2010/08/27 00:48:19 sthen Exp $
---- Makefile.orig Thu Jun 10 21:35:06 2010
-+++ Makefile Wed Jun 30 15:25:51 2010
-@@ -121,7 +121,7 @@ ASTTOPDIR:=$(subst $(space),\$(space),$(CURDIR))
+<<<<<<< patch-Makefile
+$OpenBSD: patch-Makefile,v 1.28 2010/07/25 10:08:03 sthen Exp $
+--- Makefile.orig Sat Jul 24 21:47:52 2010
++++ Makefile Tue Aug 31 12:14:33 2010
+@@ -122,7 +122,7 @@ ASTTOPDIR:=$(subst $(space),\$(space),$(CURDIR))
OVERWRITE=y
# Include debug and macro symbols in the executables (-g) and profiling info
(-pg)
-DEBUG=-g3
+#DEBUG=-g3
-
# Define standard directories for various platforms
-@@ -181,8 +181,10 @@ HTTP_CGIDIR=/var/www/cgi-bin
+ # These apply if they are not redefined in asterisk.conf
+@@ -192,8 +192,10 @@ LINKER_SYMBOL_PREFIX=
# The file /etc/asterisk.makeopts will also be included but can be overridden
# by the file in your home directory.
@@ -21,7 +22,7 @@ $OpenBSD: patch-Makefile,v 1.29 2010/08/
MOD_SUBDIR_CFLAGS=-I$(ASTTOPDIR)/include
OTHER_SUBDIR_CFLAGS=-I$(ASTTOPDIR)/include
-@@ -225,7 +227,9 @@ endif
+@@ -236,7 +238,9 @@ endif
ifeq ($(findstring -save-temps,$(_ASTCFLAGS) $(ASTCFLAGS)),)
ifeq ($(findstring -pipe,$(_ASTCFLAGS) $(ASTCFLAGS)),)
@@ -31,7 +32,7 @@ $OpenBSD: patch-Makefile,v 1.29 2010/08/
endif
endif
-@@ -251,7 +255,9 @@ endif
+@@ -262,7 +266,9 @@ endif
ifeq ($(findstring -march,$(_ASTCFLAGS) $(ASTCFLAGS)),)
ifneq ($(PROC),ultrasparc)
@@ -41,29 +42,3 @@ $OpenBSD: patch-Makefile,v 1.29 2010/08/
endif
endif
-@@ -728,18 +734,18 @@ samples: adsi
- echo " ; temporary codec translation
path for a channel that may not otherwise require one." ; \
- echo ";transcode_via_sln = yes ; Build transcode paths via
SLINEAR, instead of directly" ; \
- echo ";sendfullybooted = yes ; Send the FullyBooted AMI event
on AMI login and when all modules are finished loading" ; \
-- echo ";runuser = asterisk ; The user to run as" ; \
-- echo ";rungroup = asterisk ; The group to run as" ; \
-+ echo "runuser = _asterisk ; The user to run as" ; \
-+ echo "rungroup = _asterisk ; The group to run as" ; \
- echo ";lightbackground = yes ; If your terminal is set for a
light-colored background" ; \
- echo "documentation_language = en_US ; Set the Language you
want Documentation displayed in. Value is in the same format as locale names" ;
\
- echo ";hideconnect = yes ; Hide messages displayed when a
remote console connects and disconnects" ; \
- echo "" ; \
- echo "; Changing the following lines may compromise your
security." ; \
-- echo ";[files]" ; \
-- echo ";astctlpermissions = 0660" ; \
-- echo ";astctlowner = root" ; \
-- echo ";astctlgroup = apache" ; \
-- echo ";astctl = asterisk.ctl" ; \
-+ echo "[files]" ; \
-+ echo "astctlpermissions = 0660" ; \
-+ echo "astctlowner = _asterisk" ; \
-+ echo "astctlgroup = wheel" ; \
-+ echo "astctl = asterisk.ctl" ; \
- echo "" ; \
- echo "[compat]" ; \
- echo "pbx_realtime=1.6" ; \
Index: patches/patch-autoconf_ast_ext_lib_m4
===================================================================
RCS file: patches/patch-autoconf_ast_ext_lib_m4
diff -N patches/patch-autoconf_ast_ext_lib_m4
--- patches/patch-autoconf_ast_ext_lib_m4 25 Jul 2010 10:08:03 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-autoconf_ast_ext_lib_m4,v 1.1 2010/07/25 10:08:03 sthen Exp $
---- autoconf/ast_ext_lib.m4.orig Sat Jul 24 10:37:59 2010
-+++ autoconf/ast_ext_lib.m4 Sat Jul 24 10:38:00 2010
-@@ -46,7 +46,7 @@ AC_ARG_WITH([$1], AC_HELP_STRING([--with-$1=PATH], [us
- unset $2
- ;;
- *)
-- if test "x${$2}" = "x"; then
-+ if test "x${withval}" = "x"; then
- m4_ifval($4, [$2="$4"], [:])
- else
- $2="${withval}"
Index: patches/patch-bootstrap_sh
===================================================================
RCS file: /cvs/ports/telephony/asterisk/patches/patch-bootstrap_sh,v
retrieving revision 1.2
diff -u -p -r1.2 patch-bootstrap_sh
--- patches/patch-bootstrap_sh 13 Dec 2009 12:11:29 -0000 1.2
+++ patches/patch-bootstrap_sh 11 Sep 2010 20:24:56 -0000
@@ -1,60 +1,42 @@
$OpenBSD: patch-bootstrap_sh,v 1.2 2009/12/13 12:11:29 sthen Exp $
---- bootstrap.sh.orig Sun Oct 11 17:11:30 2009
-+++ bootstrap.sh Sun Oct 11 17:10:37 2009
-@@ -9,29 +9,34 @@ check_for_app() {
+--- bootstrap.sh.orig Tue May 11 17:43:07 2010
++++ bootstrap.sh Tue Aug 24 21:02:59 2010
+@@ -9,25 +9,29 @@ check_for_app() {
fi
}
-# On FreeBSD and OpenBSD, multiple autoconf/automake versions have different
names.
--# On linux, envitonment variables tell which one to use.
+-# On Linux, environment variables tell which one to use.
+MY_AC_VER=
+MY_AM_VER=
--uname -s | grep -q BSD
--if [ $? = 0 ] ; then # BSD case
-- case `uname -sr` in
-- 'FreeBSD 4'*) # FreeBSD 4.x has a different naming
-- MY_AC_VER=259
-- MY_AM_VER=19
-- ;;
-- *)
-- MY_AC_VER=-2.61
-- MY_AM_VER=-1.9
-- ;;
-- esac
--else # linux case
-- MY_AC_VER=
-- MY_AM_VER=
-- AUTOCONF_VERSION=2.60
-- AUTOMAKE_VERSION=1.9
-- export AUTOCONF_VERSION
-- export AUTOMAKE_VERSION
--fi
++
+# On FreeBSD, multiple autoconf/automake versions have different names.
+# On Linux and OpenBSD, environment variables tell which one to use.
+
-+case `uname -sr` in
-+ 'FreeBSD 4'*) # FreeBSD 4.x has a different naming
-+ MY_AC_VER=259
-+ MY_AM_VER=19
-+ ;;
+ case `uname -sr` in
+ 'FreeBSD 4'*) # FreeBSD 4.x has a different naming
+ MY_AC_VER=259
+ MY_AM_VER=19
+ ;;
+- *'BSD'*)
+- MY_AC_VER=-2.62
+- MY_AM_VER=-1.9
+ OpenBSD*)
+ [ -z "$AUTOCONF_VERSION" ] && AUTOCONF_VERSION=2.61
+ [ -z "$AUTOMAKE_VERSION" ] && AUTOMAKE_VERSION=1.9
+ export AUTOCONF_VERSION
+ export AUTOMAKE_VERSION
-+ ;;
+ ;;
+- *'SunOS '*)
+- MY_AC_VER=
+ *BSD*)
+ MY_AC_VER=-2.61
-+ MY_AM_VER=-1.9
-+ ;;
-+ *)
-+ AUTOCONF_VERSION=2.60
-+ AUTOMAKE_VERSION=1.9
-+ export AUTOCONF_VERSION
-+ export AUTOMAKE_VERSION
-+ ;;
-+esac
-
- check_for_app autoconf${MY_AC_VER}
- check_for_app autoheader${MY_AC_VER}
+ MY_AM_VER=-1.9
+ ;;
+ *)
+- MY_AC_VER=
+- MY_AM_VER=
+ AUTOCONF_VERSION=2.60
+ AUTOMAKE_VERSION=1.9
+ export AUTOCONF_VERSION
Index: patches/patch-configs_asterisk_conf_sample
===================================================================
RCS file: patches/patch-configs_asterisk_conf_sample
diff -N patches/patch-configs_asterisk_conf_sample
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-configs_asterisk_conf_sample 11 Sep 2010 20:24:56 -0000
@@ -0,0 +1,31 @@
+$OpenBSD$
+--- configs/asterisk.conf.sample.orig Tue Aug 24 21:00:26 2010
++++ configs/asterisk.conf.sample Tue Aug 24 21:01:19 2010
+@@ -57,8 +57,8 @@ astlogdir => /var/log/asterisk
+ ; not otherwise require one.
+ ;transcode_via_sln = yes ; Build transcode paths via SLINEAR, instead of
+ ; directly.
+-;runuser = asterisk ; The user to run as.
+-;rungroup = asterisk ; The group to run as.
++runuser = _asterisk ; The user to run as.
++rungroup = _asterisk ; The group to run as.
+ ;lightbackground = yes ; If your terminal is set for a
light-colored
+ ; background.
+ documentation_language = en_US ; Set the language you want
documentation
+@@ -71,11 +71,11 @@ documentation_language = en_US ; Set the language you
+ ; lock.
+
+ ; Changing the following lines may compromise your security.
+-;[files]
+-;astctlpermissions = 0660
+-;astctlowner = root
+-;astctlgroup = apache
+-;astctl = asterisk.ctl
++[files]
++astctlpermissions = 0660
++astctlowner = _asterisk
++astctlgroup = wheel
++astctl = asterisk.ctl
+
+ [compat]
+ pbx_realtime=1.6
Index: patches/patch-configure_ac
===================================================================
RCS file: /cvs/ports/telephony/asterisk/patches/patch-configure_ac,v
retrieving revision 1.11
diff -u -p -r1.11 patch-configure_ac
--- patches/patch-configure_ac 25 Jul 2010 10:08:03 -0000 1.11
+++ patches/patch-configure_ac 11 Sep 2010 20:24:56 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure_ac,v 1.11 2010/07/25 10:08:03 sthen Exp $
---- configure.ac.orig Mon Jun 7 23:13:04 2010
-+++ configure.ac Sat Jul 24 12:42:48 2010
-@@ -1231,7 +1231,7 @@ if test "${USE_IMAP_TK}" != "no"; then
+--- configure.ac.orig Fri Aug 13 17:02:20 2010
++++ configure.ac Tue Aug 24 19:39:07 2010
+@@ -1375,7 +1375,7 @@ if test "${USE_IMAP_TK}" != "no"; then
)
else #looking in imap directory didn't work, try c-client
imap_ldflags=""
@@ -10,7 +10,7 @@ $OpenBSD: patch-configure_ac,v 1.11 2010
imap_include="-DUSE_SYSTEM_CCLIENT"
CPPFLAGS="${saved_cppflags}"
LIBS="${saved_libs}"
-@@ -1424,7 +1424,7 @@ AST_EXT_TOOL_CHECK([NETSNMP], [net-snmp], , [--agent-l
+@@ -1585,7 +1585,7 @@ AST_EXT_TOOL_CHECK([NETSNMP], [net-snmp-config], , [--
AST_EXT_LIB_CHECK([NEWT], [newt], [newtBell], [newt.h])
@@ -19,9 +19,9 @@ $OpenBSD: patch-configure_ac,v 1.11 2010
AST_EXT_LIB_CHECK([OGG], [ogg], [ogg_sync_init], [])
-@@ -1549,7 +1549,8 @@ if test "${PBX_PWLIB}" = "1" -a "${USE_OPENH323}" != "
+@@ -1724,7 +1724,8 @@ if test "${PBX_PWLIB}" = "1" -a "${USE_OPENH323}" != "
AST_CHECK_OPENH323()
- AST_CHECK_PWLIB_VERSION([OpenH323], [OPENH323], [openh323buildopts.h],
[1], [17], [3])
+ AST_CHECK_PWLIB_VERSION([OpenH323], [OPENH323], [openh323buildopts.h],
[1], [17], [3], [], [1], [19], [0])
AST_CHECK_OPENH323_BUILD()
- PLATFORM_OPENH323="h323_${PWLIB_PLATFORM}_${OPENH323_SUFFIX}"
+ dnl PLATFORM_OPENH323="h323_${PWLIB_PLATFORM}_${OPENH323_SUFFIX}"
@@ -29,7 +29,7 @@ $OpenBSD: patch-configure_ac,v 1.11 2010
AST_CHECK_PWLIB_BUILD([OpenH323], [OPENH323],
[Define if your system has the OpenH323 libraries.],
[#include "ptlib.h"
-@@ -1652,7 +1653,8 @@ AST_EXT_LIB_CHECK([USB], [usb], [usb_init], [usb.h], [
+@@ -1861,7 +1862,8 @@ AST_EXT_LIB_CHECK([USB], [usb], [usb_init], [usb.h], [
if test "${OSARCH}" = "OpenBSD";
then
Index: patches/patch-include_asterisk_dnsmgr_h
===================================================================
RCS file: patches/patch-include_asterisk_dnsmgr_h
diff -N patches/patch-include_asterisk_dnsmgr_h
--- patches/patch-include_asterisk_dnsmgr_h 9 Apr 2010 11:05:55 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,30 +0,0 @@
-$OpenBSD: patch-include_asterisk_dnsmgr_h,v 1.1 2010/04/09 11:05:55 sthen Exp $
-
-https://issues.asterisk.org/view.php?id=15827
-
---- include/asterisk/dnsmgr.h.orig Mon Mar 9 20:58:17 2009
-+++ include/asterisk/dnsmgr.h Fri Apr 9 10:46:27 2010
-@@ -42,12 +42,12 @@ struct ast_dnsmgr_entry;
- *
- * \param name the hostname
- * \param result where the DNS manager should store the IP address as it
refreshes it.
-- * it.
-+ * \param service SRV prefix (optional, set to NULL to disable SRV)
- *
- * This function allocates a new DNS manager entry object, and fills it with
the
- * provided hostname and IP address. This function does not force an initial
lookup
-- * of the IP address. So, generally, this should be used when the initial
address
-- * is already known.
-+ * of the IP address. So, this should be used when the initial address
-+ * is already known and stored in result.
- *
- * \return a DNS manager entry
- * \version 1.6.1 result changed from struct in_addr to struct sockaddr_in to
store port number
-@@ -69,6 +69,7 @@ void ast_dnsmgr_release(struct ast_dnsmgr_entry *entry
- * \param name the hostname
- * \param result where to store the IP address as the DNS manager refreshes it
- * \param dnsmgr Where to store the allocate DNS manager entry
-+ * \param service SRV prefix (optional, set to NULL to disable SRV)
- *
- * This function allocates a new DNS manager entry object, and fills it with
- * the provided hostname and IP address. This function _does_ force an
initial
Index: patches/patch-main_asterisk_c
===================================================================
RCS file: /cvs/ports/telephony/asterisk/patches/patch-main_asterisk_c,v
retrieving revision 1.16
diff -u -p -r1.16 patch-main_asterisk_c
--- patches/patch-main_asterisk_c 25 Jul 2010 10:08:03 -0000 1.16
+++ patches/patch-main_asterisk_c 11 Sep 2010 20:24:56 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-main_asterisk_c,v 1.16 2010/07/25 10:08:03 sthen Exp $
---- main/asterisk.c.orig Thu Jun 10 15:25:16 2010
-+++ main/asterisk.c Mon Jul 5 22:50:50 2010
-@@ -1174,7 +1174,7 @@ static pthread_t lthread;
+--- main/asterisk.c.orig Tue Jul 27 23:30:38 2010
++++ main/asterisk.c Tue Aug 24 19:39:08 2010
+@@ -1183,7 +1183,7 @@ static pthread_t lthread;
static int read_credentials(int fd, char *buffer, size_t size, struct console
*con)
{
#if defined(SO_PEERCRED)
Index: pkg/DESCR-calendar
===================================================================
RCS file: pkg/DESCR-calendar
diff -N pkg/DESCR-calendar
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/DESCR-calendar 11 Sep 2010 20:24:56 -0000
@@ -0,0 +1 @@
+iCal support for Asterisk's calendar functions.
Index: pkg/DESCR-curl
===================================================================
RCS file: pkg/DESCR-curl
diff -N pkg/DESCR-curl
--- pkg/DESCR-curl 5 Sep 2007 22:42:52 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,2 +0,0 @@
-Allows a dialplan to requests an URL and optionally post data.
-Mainly used for signalling external applications of an event.
Index: pkg/DESCR-fax
===================================================================
RCS file: pkg/DESCR-fax
diff -N pkg/DESCR-fax
--- pkg/DESCR-fax 13 Dec 2009 12:11:29 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1 +0,0 @@
-Fax support for Asterisk.
Index: pkg/DESCR-jabber
===================================================================
RCS file: pkg/DESCR-jabber
diff -N pkg/DESCR-jabber
--- pkg/DESCR-jabber 5 Sep 2007 22:42:52 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,4 +0,0 @@
-Jabber support for Asterisk, providing:
-
- res_jabber.so: AJI - Asterisk Jabber Interface
- chan_gtalk.so: Gtalk Channel Driver
Index: pkg/DESCR-pgsql
===================================================================
RCS file: /cvs/ports/telephony/asterisk/pkg/DESCR-pgsql,v
retrieving revision 1.1
diff -u -p -r1.1 DESCR-pgsql
--- pkg/DESCR-pgsql 5 Sep 2007 22:42:52 -0000 1.1
+++ pkg/DESCR-pgsql 11 Sep 2010 20:24:56 -0000
@@ -1,4 +1,5 @@
PostgreSQL functions for Asterisk. This includes:
cdr_pgsql.so: Database-backed CDR logging
+cel_pgsql.so: Database-backed channel-event logging
res_config_pgsql.so: Asterisk PostgreSQL RealTime configuration
Index: pkg/PLIST-calendar
===================================================================
RCS file: pkg/PLIST-calendar
diff -N pkg/PLIST-calendar
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/PLIST-calendar 11 Sep 2010 20:24:56 -0000
@@ -0,0 +1,5 @@
+...@comment $OpenBSD$
+lib/asterisk/modules/res_calendar.so
+lib/asterisk/modules/res_calendar_caldav.so
+lib/asterisk/modules/res_calendar_exchange.so
+lib/asterisk/modules/res_calendar_icalendar.so
Index: pkg/PLIST-curl
===================================================================
RCS file: pkg/PLIST-curl
diff -N pkg/PLIST-curl
--- pkg/PLIST-curl 8 Apr 2010 16:18:00 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,5 +0,0 @@
-...@comment $OpenBSD: PLIST-curl,v 1.4 2010/04/08 16:18:00 sthen Exp $
-...@pkgpath telephony/asterisk,-curl,h323
-lib/asterisk/modules/func_curl.so
-lib/asterisk/modules/res_config_curl.so
-lib/asterisk/modules/res_curl.so
Index: pkg/PLIST-fax
===================================================================
RCS file: pkg/PLIST-fax
diff -N pkg/PLIST-fax
--- pkg/PLIST-fax 26 Feb 2010 12:44:14 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,3 +0,0 @@
-...@comment $OpenBSD: PLIST-fax,v 1.2 2010/02/26 12:44:14 sthen Exp $
-...@pkgpath telephony/asterisk,-fax,h323
-lib/asterisk/modules/app_fax.so
Index: pkg/PLIST-jabber
===================================================================
RCS file: pkg/PLIST-jabber
diff -N pkg/PLIST-jabber
--- pkg/PLIST-jabber 26 Feb 2010 12:44:14 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-...@comment $OpenBSD: PLIST-jabber,v 1.3 2010/02/26 12:44:14 sthen Exp $
-...@pkgpath telephony/asterisk,-jabber,h323
-include/asterisk/jabber.h
-include/asterisk/jingle.h
-lib/asterisk/modules/chan_gtalk.so
-lib/asterisk/modules/chan_jingle.so
-lib/asterisk/modules/res_jabber.so
-share/doc/asterisk/jabber.txt
-share/doc/asterisk/jingle.txt
-share/examples/asterisk/default/gtalk.conf
-...@sample ${SYSCONFDIR}/asterisk/gtalk.conf
-share/examples/asterisk/default/jabber.conf
-...@mode 640
-...@group _asterisk
-...@sample ${SYSCONFDIR}/asterisk/jabber.conf
-...@mode
-...@group
-share/examples/asterisk/default/jingle.conf
-...@sample ${SYSCONFDIR}/asterisk/jingle.conf
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/telephony/asterisk/pkg/PLIST-main,v
retrieving revision 1.31
diff -u -p -r1.31 PLIST-main
--- pkg/PLIST-main 25 Jul 2010 10:08:03 -0000 1.31
+++ pkg/PLIST-main 11 Sep 2010 20:24:56 -0000
@@ -1,9 +1,18 @@
@comment $OpenBSD: PLIST-main,v 1.31 2010/07/25 10:08:03 sthen Exp $
@conflict asterisk-sounds-<=1.2.1p2
+...@conflict asterisk-curl-*
+...@conflict asterisk-fax-*
@conflict asterisk-ogg-*
+...@conflict asterisk-jabber-*
@conflict chan_unistim-*
+...@pkgpath telephony/asterisk,-curl
+...@pkgpath telephony/asterisk,-curl,h323
@pkgpath telephony/asterisk,-ogg
+...@pkgpath telephony/asterisk,-jabber
+...@pkgpath telephony/asterisk,-jabber,h323
@pkgpath telephony/chan_unistim
+...@pkgpath telephony/asterisk,-fax
+...@pkgpath telephony/asterisk,-fax,h323
@newgroup _asterisk:545
@newuser _asterisk:545:_asterisk:daemon:asterisk
user:/nonexistent:/sbin/nologin
include/asterisk/
@@ -13,10 +22,9 @@ include/asterisk/abstract_jb.h
include/asterisk/acl.h
include/asterisk/adsi.h
include/asterisk/ael_structs.h
-include/asterisk/aes.h
-include/asterisk/aes_internal.h
include/asterisk/agi.h
include/asterisk/alaw.h
+include/asterisk/aoc.h
include/asterisk/app.h
include/asterisk/ast_expr.h
include/asterisk/ast_version.h
@@ -26,6 +34,7 @@ include/asterisk/astobj.h
include/asterisk/astobj2.h
include/asterisk/astosp.h
include/asterisk/audiohook.h
+include/asterisk/autochan.h
include/asterisk/autoconfig.h
include/asterisk/bridging.h
include/asterisk/bridging_features.h
@@ -33,22 +42,35 @@ include/asterisk/bridging_technology.h
include/asterisk/build.h
include/asterisk/buildinfo.h
include/asterisk/buildopts.h
+include/asterisk/calendar.h
include/asterisk/callerid.h
include/asterisk/causes.h
+include/asterisk/ccss.h
include/asterisk/cdr.h
+include/asterisk/cel.h
include/asterisk/channel.h
+include/asterisk/channelstate.h
include/asterisk/chanvars.h
include/asterisk/cli.h
include/asterisk/compat.h
include/asterisk/compiler.h
include/asterisk/config.h
include/asterisk/crypto.h
+include/asterisk/data.h
include/asterisk/datastore.h
include/asterisk/devicestate.h
include/asterisk/dial.h
include/asterisk/dlinkedlists.h
include/asterisk/dns.h
include/asterisk/dnsmgr.h
+include/asterisk/doxygen/
+include/asterisk/doxygen/architecture.h
+include/asterisk/doxygen/asterisk-git-howto.h
+include/asterisk/doxygen/commits.h
+include/asterisk/doxygen/licensing.h
+include/asterisk/doxygen/mantisworkflow.h
+include/asterisk/doxygen/releases.h
+include/asterisk/doxygen/reviewboard.h
include/asterisk/doxyref.h
include/asterisk/dsp.h
include/asterisk/dundi.h
@@ -60,6 +82,7 @@ include/asterisk/extconf.h
include/asterisk/features.h
include/asterisk/file.h
include/asterisk/frame.h
+include/asterisk/frame_defs.h
include/asterisk/fskmodem.h
include/asterisk/fskmodem_float.h
include/asterisk/fskmodem_int.h
@@ -71,6 +94,8 @@ include/asterisk/image.h
include/asterisk/indications.h
include/asterisk/inline_api.h
include/asterisk/io.h
+include/asterisk/jabber.h
+include/asterisk/jingle.h
include/asterisk/linkedlists.h
include/asterisk/localtime.h
include/asterisk/lock.h
@@ -82,17 +107,24 @@ include/asterisk/module.h
include/asterisk/monitor.h
include/asterisk/musiconhold.h
include/asterisk/netsock.h
+include/asterisk/netsock2.h
include/asterisk/network.h
+include/asterisk/optional_api.h
include/asterisk/options.h
include/asterisk/paths.h
include/asterisk/pbx.h
+include/asterisk/pktccops.h
include/asterisk/plc.h
include/asterisk/poll-compat.h
include/asterisk/privacy.h
include/asterisk/pval.h
-include/asterisk/rtp.h
+include/asterisk/res_fax.h
+include/asterisk/res_srtp.h
+include/asterisk/rtp_engine.h
include/asterisk/say.h
include/asterisk/sched.h
+include/asterisk/security_events.h
+include/asterisk/security_events_defs.h
include/asterisk/sha1.h
include/asterisk/slin.h
include/asterisk/slinfactory.h
@@ -101,6 +133,8 @@ include/asterisk/speech.h
include/asterisk/srv.h
include/asterisk/stringfields.h
include/asterisk/strings.h
+include/asterisk/stun.h
+include/asterisk/syslog.h
include/asterisk/taskprocessor.h
include/asterisk/tcptls.h
include/asterisk/tdd.h
@@ -125,6 +159,7 @@ lib/asterisk/modules/app_alarmreceiver.s
lib/asterisk/modules/app_amd.so
lib/asterisk/modules/app_authenticate.so
lib/asterisk/modules/app_cdr.so
+lib/asterisk/modules/app_celgenuserevent.so
lib/asterisk/modules/app_chanisavail.so
lib/asterisk/modules/app_channelredirect.so
lib/asterisk/modules/app_chanspy.so
@@ -192,11 +227,17 @@ lib/asterisk/modules/cdr_csv.so
lib/asterisk/modules/cdr_custom.so
lib/asterisk/modules/cdr_manager.so
lib/asterisk/modules/cdr_sqlite3_custom.so
+lib/asterisk/modules/cdr_syslog.so
+lib/asterisk/modules/cel_custom.so
+lib/asterisk/modules/cel_manager.so
+lib/asterisk/modules/cel_sqlite3_custom.so
lib/asterisk/modules/chan_agent.so
lib/asterisk/modules/chan_bridge.so
+lib/asterisk/modules/chan_gtalk.so
lib/asterisk/modules/chan_iax2.so
+lib/asterisk/modules/chan_jingle.so
lib/asterisk/modules/chan_local.so
-lib/asterisk/modules/chan_mgcp.so
+lib/asterisk/modules/chan_multicast_rtp.so
lib/asterisk/modules/chan_sip.so
lib/asterisk/modules/chan_skinny.so
lib/asterisk/modules/chan_unistim.so
@@ -208,6 +249,7 @@ lib/asterisk/modules/codec_g726.so
lib/asterisk/modules/codec_gsm.so
lib/asterisk/modules/codec_lpc10.so
lib/asterisk/modules/codec_ulaw.so
+lib/asterisk/modules/format_g719.so
lib/asterisk/modules/format_g723.so
lib/asterisk/modules/format_g726.so
lib/asterisk/modules/format_g729.so
@@ -229,10 +271,12 @@ lib/asterisk/modules/func_aes.so
lib/asterisk/modules/func_audiohookinherit.so
lib/asterisk/modules/func_base64.so
lib/asterisk/modules/func_blacklist.so
+lib/asterisk/modules/func_callcompletion.so
lib/asterisk/modules/func_callerid.so
lib/asterisk/modules/func_cdr.so
lib/asterisk/modules/func_channel.so
lib/asterisk/modules/func_config.so
+lib/asterisk/modules/func_curl.so
lib/asterisk/modules/func_cut.so
lib/asterisk/modules/func_db.so
lib/asterisk/modules/func_devstate.so
@@ -248,11 +292,13 @@ lib/asterisk/modules/func_logic.so
lib/asterisk/modules/func_math.so
lib/asterisk/modules/func_md5.so
lib/asterisk/modules/func_module.so
+lib/asterisk/modules/func_pitchshift.so
lib/asterisk/modules/func_rand.so
lib/asterisk/modules/func_realtime.so
lib/asterisk/modules/func_sha1.so
lib/asterisk/modules/func_shell.so
lib/asterisk/modules/func_sprintf.so
+lib/asterisk/modules/func_srv.so
lib/asterisk/modules/func_strings.so
lib/asterisk/modules/func_sysinfo.so
lib/asterisk/modules/func_timeout.so
@@ -271,40 +317,38 @@ lib/asterisk/modules/res_ael_share.so
lib/asterisk/modules/res_agi.so
lib/asterisk/modules/res_clialiases.so
lib/asterisk/modules/res_clioriginate.so
+lib/asterisk/modules/res_config_curl.so
lib/asterisk/modules/res_convert.so
lib/asterisk/modules/res_crypto.so
+lib/asterisk/modules/res_curl.so
+lib/asterisk/modules/res_fax.so
+lib/asterisk/modules/res_fax_spandsp.so
+lib/asterisk/modules/res_jabber.so
lib/asterisk/modules/res_limit.so
lib/asterisk/modules/res_monitor.so
lib/asterisk/modules/res_musiconhold.so
+lib/asterisk/modules/res_mutestream.so
lib/asterisk/modules/res_phoneprov.so
lib/asterisk/modules/res_realtime.so
+lib/asterisk/modules/res_rtp_asterisk.so
+lib/asterisk/modules/res_rtp_multicast.so
+lib/asterisk/modules/res_security_log.so
lib/asterisk/modules/res_smdi.so
lib/asterisk/modules/res_speech.so
+lib/asterisk/modules/res_stun_monitor.so
lib/asterisk/modules/res_timing_pthread.so
@man man/man8/asterisk.8
@man man/man8/astgenkey.8
@man man/man8/autosupport.8
@man man/man8/safe_asterisk.8
-...@bin sbin/aelparse
@bin sbin/astcanary
@bin sbin/asterisk
sbin/astgenkey
sbin/autosupport
-...@bin sbin/conf2ael
-...@bin sbin/hashtest
-...@bin sbin/hashtest2
sbin/rasterisk
-...@bin sbin/refcounter
sbin/safe_asterisk
-...@bin sbin/smsq
-...@bin sbin/stereorize
-...@bin sbin/streamplayer
share/asterisk/
share/asterisk/agi-bin/
-share/asterisk/agi-bin/agi-test.agi
-...@bin share/asterisk/agi-bin/eagi-sphinx-test
-...@bin share/asterisk/agi-bin/eagi-test
-share/asterisk/agi-bin/jukebox.agi
share/asterisk/documentation/
share/asterisk/documentation/appdocsxml.dtd
share/asterisk/documentation/core-en_US.xml
@@ -315,10 +359,8 @@ share/asterisk/images/
share/asterisk/images/asterisk-intro.jpg
share/asterisk/images/kpad2.jpg
share/asterisk/keys/
-share/asterisk/keys/freeworlddialup.pub
-share/asterisk/keys/iaxtel.pub
share/asterisk/moh/
-share/asterisk/moh/.asterisk-moh-opsound-wav-2.03
+share/asterisk/moh/.${SOUNDS_MOH}
share/asterisk/moh/CHANGES-asterisk-moh-opsound-wav
share/asterisk/moh/CREDITS-asterisk-moh-opsound-wav
share/asterisk/moh/LICENSE-asterisk-moh-opsound-wav
@@ -334,11 +376,11 @@ share/asterisk/phoneprov/000000000000.cf
share/asterisk/phoneprov/polycom.xml
share/asterisk/phoneprov/polycom_line.xml
share/asterisk/sounds/
-share/asterisk/sounds/.asterisk-core-sounds-en-gsm-${CORESOUNDS}
+share/asterisk/sounds/.${SOUNDS_CORE}
share/asterisk/sounds/en/
-share/asterisk/sounds/en/CHANGES-asterisk-core-en-${CORESOUNDS}
-share/asterisk/sounds/en/CREDITS-asterisk-core-en-${CORESOUNDS}
-share/asterisk/sounds/en/LICENSE-asterisk-core-en-${CORESOUNDS}
+share/asterisk/sounds/en/CHANGES-asterisk-core-en-${SVER_CORE}
+share/asterisk/sounds/en/CREDITS-asterisk-core-en-${SVER_CORE}
+share/asterisk/sounds/en/LICENSE-asterisk-core-en-${SVER_CORE}
share/asterisk/sounds/en/agent-alreadyon.gsm
share/asterisk/sounds/en/agent-incorrect.gsm
share/asterisk/sounds/en/agent-loggedoff.gsm
@@ -1038,15 +1080,98 @@ share/asterisk/static-http/docs/node289.
share/asterisk/static-http/docs/node29.html
share/asterisk/static-http/docs/node290.html
share/asterisk/static-http/docs/node291.html
+share/asterisk/static-http/docs/node292.html
+share/asterisk/static-http/docs/node293.html
+share/asterisk/static-http/docs/node294.html
+share/asterisk/static-http/docs/node295.html
+share/asterisk/static-http/docs/node296.html
+share/asterisk/static-http/docs/node297.html
+share/asterisk/static-http/docs/node298.html
+share/asterisk/static-http/docs/node299.html
share/asterisk/static-http/docs/node3.html
share/asterisk/static-http/docs/node30.html
+share/asterisk/static-http/docs/node300.html
+share/asterisk/static-http/docs/node301.html
+share/asterisk/static-http/docs/node302.html
+share/asterisk/static-http/docs/node303.html
+share/asterisk/static-http/docs/node304.html
+share/asterisk/static-http/docs/node305.html
+share/asterisk/static-http/docs/node306.html
+share/asterisk/static-http/docs/node307.html
+share/asterisk/static-http/docs/node308.html
+share/asterisk/static-http/docs/node309.html
share/asterisk/static-http/docs/node31.html
+share/asterisk/static-http/docs/node310.html
+share/asterisk/static-http/docs/node311.html
+share/asterisk/static-http/docs/node312.html
+share/asterisk/static-http/docs/node313.html
+share/asterisk/static-http/docs/node314.html
+share/asterisk/static-http/docs/node315.html
+share/asterisk/static-http/docs/node316.html
+share/asterisk/static-http/docs/node317.html
+share/asterisk/static-http/docs/node318.html
+share/asterisk/static-http/docs/node319.html
share/asterisk/static-http/docs/node32.html
+share/asterisk/static-http/docs/node320.html
+share/asterisk/static-http/docs/node321.html
+share/asterisk/static-http/docs/node322.html
+share/asterisk/static-http/docs/node323.html
+share/asterisk/static-http/docs/node324.html
+share/asterisk/static-http/docs/node325.html
+share/asterisk/static-http/docs/node326.html
+share/asterisk/static-http/docs/node327.html
+share/asterisk/static-http/docs/node328.html
+share/asterisk/static-http/docs/node329.html
share/asterisk/static-http/docs/node33.html
+share/asterisk/static-http/docs/node330.html
+share/asterisk/static-http/docs/node331.html
+share/asterisk/static-http/docs/node332.html
+share/asterisk/static-http/docs/node333.html
+share/asterisk/static-http/docs/node334.html
+share/asterisk/static-http/docs/node335.html
+share/asterisk/static-http/docs/node336.html
+share/asterisk/static-http/docs/node337.html
+share/asterisk/static-http/docs/node338.html
+share/asterisk/static-http/docs/node339.html
share/asterisk/static-http/docs/node34.html
+share/asterisk/static-http/docs/node340.html
+share/asterisk/static-http/docs/node341.html
+share/asterisk/static-http/docs/node342.html
+share/asterisk/static-http/docs/node343.html
+share/asterisk/static-http/docs/node344.html
+share/asterisk/static-http/docs/node345.html
+share/asterisk/static-http/docs/node346.html
+share/asterisk/static-http/docs/node347.html
+share/asterisk/static-http/docs/node348.html
+share/asterisk/static-http/docs/node349.html
share/asterisk/static-http/docs/node35.html
+share/asterisk/static-http/docs/node350.html
+share/asterisk/static-http/docs/node351.html
+share/asterisk/static-http/docs/node352.html
+share/asterisk/static-http/docs/node353.html
+share/asterisk/static-http/docs/node354.html
+share/asterisk/static-http/docs/node355.html
+share/asterisk/static-http/docs/node356.html
+share/asterisk/static-http/docs/node357.html
+share/asterisk/static-http/docs/node358.html
+share/asterisk/static-http/docs/node359.html
share/asterisk/static-http/docs/node36.html
+share/asterisk/static-http/docs/node360.html
+share/asterisk/static-http/docs/node361.html
+share/asterisk/static-http/docs/node362.html
+share/asterisk/static-http/docs/node363.html
+share/asterisk/static-http/docs/node364.html
+share/asterisk/static-http/docs/node365.html
+share/asterisk/static-http/docs/node366.html
+share/asterisk/static-http/docs/node367.html
+share/asterisk/static-http/docs/node368.html
+share/asterisk/static-http/docs/node369.html
share/asterisk/static-http/docs/node37.html
+share/asterisk/static-http/docs/node370.html
+share/asterisk/static-http/docs/node371.html
+share/asterisk/static-http/docs/node372.html
+share/asterisk/static-http/docs/node373.html
+share/asterisk/static-http/docs/node374.html
share/asterisk/static-http/docs/node38.html
share/asterisk/static-http/docs/node39.html
share/asterisk/static-http/docs/node4.html
@@ -1118,6 +1243,7 @@ share/asterisk/static-http/docs/node99.h
share/asterisk/static-http/prototype.js
share/doc/asterisk/
share/doc/asterisk/BUGS
+share/doc/asterisk/CCSS_architecture.pdf
share/doc/asterisk/CHANGES
share/doc/asterisk/CODING-GUIDELINES
share/doc/asterisk/COPYING
@@ -1132,12 +1258,14 @@ share/doc/asterisk/Makefile
share/doc/asterisk/PEERING
share/doc/asterisk/README
share/doc/asterisk/README-SERIOUSLY.bestpractices.txt
+share/doc/asterisk/README-addons.txt
share/doc/asterisk/README.txt
share/doc/asterisk/UPGRADE-1.2.txt
share/doc/asterisk/UPGRADE-1.4.txt
share/doc/asterisk/UPGRADE-1.6.txt
share/doc/asterisk/UPGRADE.txt
share/doc/asterisk/WARNINGS
+share/doc/asterisk/advice_of_charge.txt
share/doc/asterisk/ael.tex
share/doc/asterisk/ajam.tex
share/doc/asterisk/api-1.6.0-changes.odt
@@ -1162,18 +1290,25 @@ share/doc/asterisk/backtrace.tex
share/doc/asterisk/backtrace.txt
share/doc/asterisk/billing.tex
share/doc/asterisk/building_queues.txt
+share/doc/asterisk/calendaring.tex
share/doc/asterisk/callfiles.txt
+share/doc/asterisk/ccss.tex
share/doc/asterisk/cdrdriver.tex
+share/doc/asterisk/cel-doc.tex
+share/doc/asterisk/celdriver.tex
+share/doc/asterisk/chan-mobile.tex
share/doc/asterisk/chan_sip-perf-testing.txt
share/doc/asterisk/chaniax.tex
share/doc/asterisk/channelvariables.tex
share/doc/asterisk/cli.txt
share/doc/asterisk/cliprompt.tex
+share/doc/asterisk/codec-64bit.txt
share/doc/asterisk/configuration.tex
share/doc/asterisk/core-en_US.xml
share/doc/asterisk/database_transactions.txt
share/doc/asterisk/datastores.txt
share/doc/asterisk/digium-mib.txt
+share/doc/asterisk/distributed_devstate-XMPP.txt
share/doc/asterisk/distributed_devstate.txt
share/doc/asterisk/dundi.tex
share/doc/asterisk/enum.tex
@@ -1203,9 +1338,12 @@ share/doc/asterisk/img8.png
share/doc/asterisk/img9.png
share/doc/asterisk/index.html
share/doc/asterisk/internals.pl
+share/doc/asterisk/jabber.txt
share/doc/asterisk/janitor-projects.txt
+share/doc/asterisk/jingle.txt
share/doc/asterisk/jitterbuffer.tex
share/doc/asterisk/labels.pl
+share/doc/asterisk/language-criteria.txt
share/doc/asterisk/localchannel.tex
share/doc/asterisk/macroexclusive.txt
share/doc/asterisk/manager.tex
@@ -1427,15 +1565,98 @@ share/doc/asterisk/node289.html
share/doc/asterisk/node29.html
share/doc/asterisk/node290.html
share/doc/asterisk/node291.html
+share/doc/asterisk/node292.html
+share/doc/asterisk/node293.html
+share/doc/asterisk/node294.html
+share/doc/asterisk/node295.html
+share/doc/asterisk/node296.html
+share/doc/asterisk/node297.html
+share/doc/asterisk/node298.html
+share/doc/asterisk/node299.html
share/doc/asterisk/node3.html
share/doc/asterisk/node30.html
+share/doc/asterisk/node300.html
+share/doc/asterisk/node301.html
+share/doc/asterisk/node302.html
+share/doc/asterisk/node303.html
+share/doc/asterisk/node304.html
+share/doc/asterisk/node305.html
+share/doc/asterisk/node306.html
+share/doc/asterisk/node307.html
+share/doc/asterisk/node308.html
+share/doc/asterisk/node309.html
share/doc/asterisk/node31.html
+share/doc/asterisk/node310.html
+share/doc/asterisk/node311.html
+share/doc/asterisk/node312.html
+share/doc/asterisk/node313.html
+share/doc/asterisk/node314.html
+share/doc/asterisk/node315.html
+share/doc/asterisk/node316.html
+share/doc/asterisk/node317.html
+share/doc/asterisk/node318.html
+share/doc/asterisk/node319.html
share/doc/asterisk/node32.html
+share/doc/asterisk/node320.html
+share/doc/asterisk/node321.html
+share/doc/asterisk/node322.html
+share/doc/asterisk/node323.html
+share/doc/asterisk/node324.html
+share/doc/asterisk/node325.html
+share/doc/asterisk/node326.html
+share/doc/asterisk/node327.html
+share/doc/asterisk/node328.html
+share/doc/asterisk/node329.html
share/doc/asterisk/node33.html
+share/doc/asterisk/node330.html
+share/doc/asterisk/node331.html
+share/doc/asterisk/node332.html
+share/doc/asterisk/node333.html
+share/doc/asterisk/node334.html
+share/doc/asterisk/node335.html
+share/doc/asterisk/node336.html
+share/doc/asterisk/node337.html
+share/doc/asterisk/node338.html
+share/doc/asterisk/node339.html
share/doc/asterisk/node34.html
+share/doc/asterisk/node340.html
+share/doc/asterisk/node341.html
+share/doc/asterisk/node342.html
+share/doc/asterisk/node343.html
+share/doc/asterisk/node344.html
+share/doc/asterisk/node345.html
+share/doc/asterisk/node346.html
+share/doc/asterisk/node347.html
+share/doc/asterisk/node348.html
+share/doc/asterisk/node349.html
share/doc/asterisk/node35.html
+share/doc/asterisk/node350.html
+share/doc/asterisk/node351.html
+share/doc/asterisk/node352.html
+share/doc/asterisk/node353.html
+share/doc/asterisk/node354.html
+share/doc/asterisk/node355.html
+share/doc/asterisk/node356.html
+share/doc/asterisk/node357.html
+share/doc/asterisk/node358.html
+share/doc/asterisk/node359.html
share/doc/asterisk/node36.html
+share/doc/asterisk/node360.html
+share/doc/asterisk/node361.html
+share/doc/asterisk/node362.html
+share/doc/asterisk/node363.html
+share/doc/asterisk/node364.html
+share/doc/asterisk/node365.html
+share/doc/asterisk/node366.html
+share/doc/asterisk/node367.html
+share/doc/asterisk/node368.html
+share/doc/asterisk/node369.html
share/doc/asterisk/node37.html
+share/doc/asterisk/node370.html
+share/doc/asterisk/node371.html
+share/doc/asterisk/node372.html
+share/doc/asterisk/node373.html
+share/doc/asterisk/node374.html
share/doc/asterisk/node38.html
share/doc/asterisk/node39.html
share/doc/asterisk/node4.html
@@ -1516,19 +1737,24 @@ share/doc/asterisk/realtime.tex
share/doc/asterisk/realtimetext.txt
share/doc/asterisk/res_config_sqlite.txt
share/doc/asterisk/rtp-packetization.txt
+share/doc/asterisk/secure-calls.tex
+share/doc/asterisk/security-events.tex
share/doc/asterisk/security.tex
share/doc/asterisk/sip-retransmit.txt
share/doc/asterisk/siptls.txt
share/doc/asterisk/sla.tex
share/doc/asterisk/smdi.txt
share/doc/asterisk/sms.txt
+share/doc/asterisk/sounds.tex
share/doc/asterisk/speechrec.txt
share/doc/asterisk/ss7.txt
share/doc/asterisk/timing.txt
share/doc/asterisk/unistim.txt
+share/doc/asterisk/urdu.ods
share/doc/asterisk/valgrind.txt
share/doc/asterisk/video.txt
share/doc/asterisk/video_console.txt
+share/doc/asterisk/vietnamese.ods
share/examples/asterisk/
@mode 750
@group _asterisk
@@ -1537,22 +1763,32 @@ share/examples/asterisk/
@group
share/examples/asterisk/default/
share/examples/asterisk/default/adsi.conf
-...@comment share/examples/asterisk/default/adtranvofr.conf
share/examples/asterisk/default/agents.conf
share/examples/asterisk/default/ais.conf
share/examples/asterisk/default/alarmreceiver.conf
@comment share/examples/asterisk/default/alsa.conf
share/examples/asterisk/default/amd.conf
+...@comment share/examples/asterisk/default/app_mysql.conf
share/examples/asterisk/default/asterisk.adsi
share/examples/asterisk/default/asterisk.conf
@sample ${SYSCONFDIR}/asterisk/asterisk.conf
+share/examples/asterisk/default/calendar.conf
+share/examples/asterisk/default/ccss.conf
share/examples/asterisk/default/cdr.conf
@sample ${SYSCONFDIR}/asterisk/cdr.conf
share/examples/asterisk/default/cdr_custom.conf
share/examples/asterisk/default/cdr_manager.conf
+...@comment share/examples/asterisk/default/cdr_mysql.conf
share/examples/asterisk/default/cdr_sqlite3_custom.conf
+share/examples/asterisk/default/cdr_syslog.conf
@comment share/examples/asterisk/default/cdr_tds.conf
+share/examples/asterisk/default/cel.conf
+share/examples/asterisk/default/cel_custom.conf
+share/examples/asterisk/default/cel_sqlite3_custom.conf
+...@comment share/examples/asterisk/default/cel_tds.conf
@comment share/examples/asterisk/default/chan_dahdi.conf
+...@comment share/examples/asterisk/default/chan_mobile.conf
+...@comment share/examples/asterisk/default/chan_ooh323.conf
share/examples/asterisk/default/cli.conf
share/examples/asterisk/default/cli_aliases.conf
share/examples/asterisk/default/cli_permissions.conf
@@ -1572,11 +1808,19 @@ share/examples/asterisk/default/extensio
share/examples/asterisk/default/features.conf
share/examples/asterisk/default/festival.conf
share/examples/asterisk/default/followme.conf
+share/examples/asterisk/default/gtalk.conf
share/examples/asterisk/default/http.conf
share/examples/asterisk/default/iax.conf
share/examples/asterisk/default/iaxprov.conf
share/examples/asterisk/default/indications.conf
@sample ${SYSCONFDIR}/asterisk/indications.conf
+share/examples/asterisk/default/jabber.conf
+...@mode 640
+...@group _asterisk
+...@sample ${SYSCONFDIR}/asterisk/jabber.conf
+...@mode
+...@group
+share/examples/asterisk/default/jingle.conf
share/examples/asterisk/default/logger.conf
share/examples/asterisk/default/manager.conf
@comment share/examples/asterisk/default/meetme.conf
@@ -1592,7 +1836,12 @@ share/examples/asterisk/default/phone.co
share/examples/asterisk/default/phoneprov.conf
share/examples/asterisk/default/queuerules.conf
share/examples/asterisk/default/queues.conf
+...@comment share/examples/asterisk/default/res_config_mysql.conf
share/examples/asterisk/default/res_config_sqlite.conf
+share/examples/asterisk/default/res_curl.conf
+share/examples/asterisk/default/res_fax.conf
+share/examples/asterisk/default/res_pktccops.conf
+share/examples/asterisk/default/res_stun_monitor.conf
@comment share/examples/asterisk/default/rpt.conf
share/examples/asterisk/default/rtp.conf
share/examples/asterisk/default/say.conf
Index: pkg/PLIST-odbc
===================================================================
RCS file: /cvs/ports/telephony/asterisk/pkg/PLIST-odbc,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST-odbc
--- pkg/PLIST-odbc 26 Feb 2010 12:44:14 -0000 1.3
+++ pkg/PLIST-odbc 11 Sep 2010 20:24:56 -0000
@@ -3,6 +3,7 @@
include/asterisk/res_odbc.h
lib/asterisk/modules/cdr_adaptive_odbc.so
lib/asterisk/modules/cdr_odbc.so
+lib/asterisk/modules/cel_odbc.so
lib/asterisk/modules/func_odbc.so
lib/asterisk/modules/res_config_odbc.so
lib/asterisk/modules/res_odbc.so
@@ -21,6 +22,14 @@ share/examples/asterisk/default/cdr_odbc
@owner root
@group _asterisk
@sample ${SYSCONFDIR}/asterisk/cdr_odbc.conf
+...@mode
+...@owner
+...@group
+share/examples/asterisk/default/cel_odbc.conf
+...@mode 640
+...@owner root
+...@group _asterisk
+...@sample ${SYSCONFDIR}/asterisk/cel_odbc.conf
@mode
@owner
@group
Index: pkg/PLIST-pgsql
===================================================================
RCS file: /cvs/ports/telephony/asterisk/pkg/PLIST-pgsql,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-pgsql
--- pkg/PLIST-pgsql 26 Feb 2010 12:44:14 -0000 1.2
+++ pkg/PLIST-pgsql 11 Sep 2010 20:24:56 -0000
@@ -1,12 +1,21 @@
@comment $OpenBSD: PLIST-pgsql,v 1.2 2010/02/26 12:44:14 sthen Exp $
@pkgpath telephony/asterisk,-pgsql,h323
lib/asterisk/modules/cdr_pgsql.so
+lib/asterisk/modules/cel_pgsql.so
lib/asterisk/modules/res_config_pgsql.so
share/examples/asterisk/default/cdr_pgsql.conf
@mode 640
@owner root
@group _asterisk
@sample ${SYSCONFDIR}/asterisk/cdr_pgsql.conf
+...@mode
+...@owner
+...@group
+share/examples/asterisk/default/cel_pgsql.conf
+...@mode 640
+...@owner root
+...@group _asterisk
+...@sample ${SYSCONFDIR}/asterisk/cel_pgsql.conf
@mode
@owner
@group
