Index: head/net/asterisk/Makefile =================================================================== --- head/net/asterisk/Makefile (revision 372447) +++ head/net/asterisk/Makefile (revision 372448) @@ -1,164 +1,164 @@ # Created by: Maxim Sobolev # $FreeBSD$ PORTNAME= asterisk -PORTVERSION= 1.8.31.1 +PORTVERSION= 1.8.32.0 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \ http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ PKGNAMESUFFIX= 18 MAINTAINER= madpilot@FreeBSD.org COMMENT= Open Source PBX and telephony toolkit LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libspeex.so:${PORTSDIR}/audio/speex \ libnewt.so:${PORTSDIR}/devel/newt \ libexecinfo.so:${PORTSDIR}/devel/libexecinfo RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 ONLY_FOR_ARCHS= i386 amd64 powerpc sparc64 GNU_CONFIGURE= yes LDFLAGS+= -L${LOCALBASE}/lib CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/openh323 USE_GCC= yes USE_GNOME= libxml2 USES= alias bison cpe gmake shebangfix CPE_VENDOR= digium SHEBANG_FILES= agi/agi-test.agi \ agi/jukebox.agi STRIP= USE_RC_SUBR= asterisk MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" \ MKDIR="${MKDIR}" \ PWLIBDIR=${LOCALBASE}/share/pwlib \ OPENH323DIR=${LOCALBASE}/share/openh323 \ OSVERSION=${OSVERSION} \ NOISY_BUILD=YES \ DOCSDIR=${DOCSDIR} \ ASTCFLAGS="${CFLAGS}" CONFLICTS_BUILD= linuxthreads-* CONFLICTS_INSTALL= asterisk*-1.4* asterisk*-1.6* asterisk*-10* OPTIONS_DEFINE= VORBIS PGSQL MYSQL ODBC RADIUS SNMP H323 FREETDS JABBER SQLITE GSM \ CURL SPANDSP EXCHANGE NEWG711 SRTP LUA LDAP OOH323 OPTIONS_DEFAULT= VORBIS ODBC PGSQL RADIUS SNMP H323 FREETDS JABBER GSM \ SQLITE CURL LUA OPTIONS_DEFINE_i386= DAHDI OPTIONS_DEFINE_amd64= DAHDI OPTIONS_DEFINE_sparc64= DAHDI OPTIONS_DEFAULT_i386= DAHDI OPTIONS_DEFAULT_amd64= DAHDI OPTIONS_DEFAULT_sparc64= DAHDI EXCHANGE_DESC?= Exchange calendar support NEWG711_DESC?= New G711 Codec SRTP_DESC?= SecureRTP support OOH323_DESC?= ooh323 support DAHDI_DESC?= DAHDI support OPTIONS_SUB= yes H323_CONFIGURE_WITH= h323 H323_LIB_DEPENDS= libpt_r.so:${PORTSDIR}/devel/pwlib \ libh323_r.so:${PORTSDIR}/net/openh323 DAHDI_CONFIGURE_ON= --with-dahdi --with-openr2 DAHDI_CONFIGURE_OFF= --without-dahdi --without-openr2 DAHDI_BUILD_DEPENDS= libpri>=1.4.10:${PORTSDIR}/misc/libpri \ ${LOCALBASE}/include/dahdi/user.h:${PORTSDIR}/misc/dahdi DAHDI_LIB_DEPENDS= libpri.so:${PORTSDIR}/misc/libpri \ libopenr2.so:${PORTSDIR}/misc/openr2 ODBC_CONFIGURE_WITH= unixodbc ODBC_CONFIGURE_ON= --with-ltdl ODBC_LIB_DEPENDS= libodbc.so:${PORTSDIR}/databases/unixODBC \ libltdl.so:${PORTSDIR}/devel/libltdl FREETDS_CONFIGURE_ON= --with-tds=${LOCALBASE} FREETDS_CONFIGURE_OFF= --without-tds FREETDS_LIB_DEPENDS= libsybdb.so:${PORTSDIR}/databases/freetds PGSQL_CONFIGURE_WITH= postgres PGSQL_USES= pgsql MYSQL_CONFIGURE_WITH= mysqlclient MYSQL_USE= MYSQL=yes VORBIS_CONFIGURE_WITH= ogg VORBIS_LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis RADIUS_CONFIGURE_WITH= radius RADIUS_LIB_DEPENDS= libradiusclient-ng.so:${PORTSDIR}/net/radiusclient SNMP_CONFIGURE_WITH= netsnmp SNMP_LIB_DEPENDS= libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp JABBER_CONFIGURE_WITH= iksemel JABBER_LIB_DEPENDS= libiksemel.so:${PORTSDIR}/textproc/iksemel SQLITE_CONFIGURE_WITH= sqlite SQLITE_CONFIGURE_OFF= --with-sqlite3=no SQLITE_LIB_DEPENDS= libsqlite.so:${PORTSDIR}/databases/sqlite2 \ libsqlite3.so:${PORTSDIR}/databases/sqlite3 GSM_CONFIGURE_WITH= gsm GSM_LIB_DEPENDS= libgsm.so:${PORTSDIR}/audio/gsm CURL_CONFIGURE_ON= --with-libcurl CURL_CONFIGURE_OFF= --with-libcurl=no CURL_LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl SPANDSP_CONFIGURE_WITH= spandsp SPANDSP_LIB_DEPENDS= libspandsp.so.2:${PORTSDIR}/comms/spandsp-devel EXCHANGE_CONFIGURE_OFF= --without-neon --without-neon29 EXCHANGE_LIB_DEPENDS= libneon.so:${PORTSDIR}/www/neon29 SRTP_CONFIGURE_WITH= srtp SRTP_BUILD_DEPENDS= libsrtp>=1.4.4:${PORTSDIR}/net/libsrtp LUA_CONFIGURE_WITH= lua LUA_USES= lua:51 LUA_CFLAGS= -I${LUA_INCDIR} LUA_LDFLAGS= -L${LUA_LIBDIR} LDAP_CONFIGURE_WITH= ldap LDAP_USE= OPENLDAP=yes PORTSCOUT= limit:^1\.8\. ASTERISK_USER?= asterisk ASTERISK_GROUP?= asterisk USERS= ${ASTERISK_USER} GROUPS= ${ASTERISK_GROUP} dahdi .include .if ${PREFIX} == ${LOCALBASE} VARDIR=/var .else VARDIR=${PREFIX}/var .endif SUB_LIST+= ASTERISK_USER=${ASTERISK_USER} PLIST_SUB+= ASTERISK_USER=${ASTERISK_USER} PLIST_SUB+= ASTERISK_GROUP=${ASTERISK_GROUP} PLIST_SUB+= VARDIR=${VARDIR} post-extract: ${FIND} ${WRKSRC} -name '*.d' -delete post-patch: ${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/musiconhold.conf.sample post-configure: @cd ${WRKSRC} && ${MAKE_CMD} menuselect.makeopts @cd ${WRKSRC} && ./menuselect/menuselect --disable res_timing_kqueue menuselect.makeopts .if ${PORT_OPTIONS:MMYSQL} @cd ${WRKSRC} && ./menuselect/menuselect --enable res_config_mysql menuselect.makeopts @cd ${WRKSRC} && ./menuselect/menuselect --enable app_mysql menuselect.makeopts @cd ${WRKSRC} && ./menuselect/menuselect --enable cdr_mysql menuselect.makeopts .endif .if ${PORT_OPTIONS:MOOH323} @cd ${WRKSRC} && ./menuselect/menuselect --enable chan_ooh323 menuselect.makeopts .endif .if ${PORT_OPTIONS:MNEWG711} @cd ${WRKSRC} && ./menuselect/menuselect --enable G711_NEW_ALGORITHM menuselect.makeopts .endif post-install: @${RM} ${STAGEDIR}${ETCDIR}/*.conf ${STAGEDIR}${ETCDIR}/extensions.ael ${STAGEDIR}${ETCDIR}/extensions.lua .include Index: head/net/asterisk/distinfo =================================================================== --- head/net/asterisk/distinfo (revision 372447) +++ head/net/asterisk/distinfo (revision 372448) @@ -1,2 +1,2 @@ -SHA256 (asterisk-1.8.31.1.tar.gz) = 430e095e937a29ec13e58c2cab6b8299caec5bbe7a6af0f396a9f29fbc926e7d -SIZE (asterisk-1.8.31.1.tar.gz) = 29630590 +SHA256 (asterisk-1.8.32.0.tar.gz) = 37dee258431baf3ef726fb89f5d590b3e5498654f5080afed649697a0a227a8f +SIZE (asterisk-1.8.32.0.tar.gz) = 29639709 Index: head/net/asterisk/files/asterisk.in =================================================================== --- head/net/asterisk/files/asterisk.in (revision 372447) +++ head/net/asterisk/files/asterisk.in (revision 372448) @@ -1,43 +1,56 @@ #!/bin/sh # # $FreeBSD$ # # PROVIDE: asterisk # REQUIRE: LOGIN # KEYWORD: shutdown # # Add the following lines to /etc/rc.conf to enable asterisk: # -# asterisk_enable="YES" +# asterisk_enable (bool): Set it to "YES" to enable asterisk +# Default is "NO" +# asterisk_user (string): User asterisk runs as +# Default is %%ASTERISK_USER%% +# asterisk_args (string): Extra argumeents to pass to asterisk at startup +# Default is "-n" +# asterisk_pidfile (string): Location of the asterisk pid file +# Default is /var/run/asterisk/asterisk.pid # . /etc/rc.subr name=asterisk rcvar=asterisk_enable +desc="Asterisk PBX server" -extra_commands="reload" +load_rc_config $name -stop_cmd="asterisk_stop" -reload_cmd="asterisk_reload" +: ${asterisk_enable:=NO} +: ${asterisk_user:=%%ASTERISK_USER%%} +: ${asterisk_args=-n} +: ${asterisk_pidfile:=/var/run/asterisk/asterisk.pid} +extra_commands=reload + +stop_cmd=asterisk_stop +reload_cmd=asterisk_reload + command="%%PREFIX%%/sbin/asterisk" -command_args="-n -F -U %%ASTERISK_USER%%" -pidfile=${asterisk_pidfile:-"/var/run/asterisk/asterisk.pid"} +command_args="${asterisk_args} -F -U ${asterisk_user}" +pidfile=${asterisk_pidfile} -asterisk_stop() { - echo 'Stopping asterisk' - $command -nqrx 'core stop now' +asterisk_stop() +{ + echo 'Stopping asterisk' + $command -nqrx 'core stop now' } -asterisk_reload() { - echo 'Reloading asterisk' - $command -nqrx 'reload' +asterisk_reload() +{ + echo 'Reloading asterisk' + $command -nqrx 'reload' } - -load_rc_config $name - -asterisk_enable=${asterisk_enable:-"NO"} run_rc_command "$1" Index: head/net/asterisk11/Makefile =================================================================== --- head/net/asterisk11/Makefile (revision 372447) +++ head/net/asterisk11/Makefile (revision 372448) @@ -1,156 +1,156 @@ # $FreeBSD$ PORTNAME= asterisk -PORTVERSION= 11.13.1 +PORTVERSION= 11.14.0 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \ http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ PKGNAMESUFFIX= 11 MAINTAINER= madpilot@FreeBSD.org COMMENT= Open Source PBX and telephony toolkit LIB_DEPENDS= libspeex.so:${PORTSDIR}/audio/speex \ libnewt.so:${PORTSDIR}/devel/newt \ libexecinfo.so:${PORTSDIR}/devel/libexecinfo \ libsqlite3.so:${PORTSDIR}/databases/sqlite3 \ libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 ONLY_FOR_ARCHS= i386 amd64 powerpc sparc64 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-uuid=${LOCALBASE} LDFLAGS+= -L${LOCALBASE}/lib CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/openh323 CFLAGS+= -I${LOCALBASE}/include USE_GCC= yes USE_GNOME= libxml2 USES= bison cpe gmake CPE_VENDOR= digium USE_RC_SUBR= asterisk MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" \ MKDIR="${MKDIR}" \ PWLIBDIR=${LOCALBASE}/share/pwlib \ OPENH323DIR=${LOCALBASE}/share/openh323 \ OSVERSION=${OSVERSION} \ NOISY_BUILD=YES \ DOCSDIR=${DOCSDIR} \ ASTCFLAGS="${CFLAGS}" CONFLICTS_BUILD= linuxthreads-* CONFLICTS_INSTALL= asterisk*-1.4* asterisk*-1.6* asterisk*-1.8* OPTIONS_DEFINE= VORBIS PGSQL MYSQL ODBC RADIUS SNMP FREETDS XMPP SQLITE GSM \ CURL SPANDSP EXCHANGE NEWG711 SRTP LUA LDAP OOH323 OPTIONS_DEFAULT= VORBIS ODBC PGSQL RADIUS SNMP FREETDS \ XMPP GSM SQLITE CURL LUA OPTIONS_DEFINE_i386= DAHDI OPTIONS_DEFINE_amd64= DAHDI OPTIONS_DEFINE_sparc64= DAHDI OPTIONS_DEFAULT_i386= DAHDI OPTIONS_DEFAULT_amd64= DAHDI OPTIONS_DEFAULT_sparc64= DAHDI EXCHANGE_DESC?= Exchange calendar support NEWG711_DESC?= New G711 Codec SRTP_DESC?= SecureRTP support OOH323_DESC?= ooh323 support DAHDI_DESC?= DAHDI support XMPP_DESC?= XMPP/GTALK support OPTIONS_SUB= yes OOH323_LIB_DEPENDS= libpt_r.so:${PORTSDIR}/devel/pwlib \ libh323_r.so:${PORTSDIR}/net/openh323 DAHDI_CONFIGURE_ON= --with-dahdi --with-openr2 DAHDI_CONFIGURE_OFF= --without-dahdi --without-openr2 DAHDI_BUILD_DEPENDS= libpri>=1.4.10:${PORTSDIR}/misc/libpri \ ${LOCALBASE}/include/dahdi/user.h:${PORTSDIR}/misc/dahdi DAHDI_LIB_DEPENDS= libpri.so:${PORTSDIR}/misc/libpri \ libopenr2.so:${PORTSDIR}/misc/openr2 ODBC_CONFIGURE_WITH= unixodbc ODBC_CONFIGURE_ON= --with-ltdl ODBC_LIB_DEPENDS= libodbc.so:${PORTSDIR}/databases/unixODBC \ libltdl.so:${PORTSDIR}/devel/libltdl FREETDS_CONFIGURE_ON= --with-tds=${LOCALBASE} FREETDS_CONFIGURE_OFF= --without-tds FREETDS_LIB_DEPENDS= libsybdb.so:${PORTSDIR}/databases/freetds PGSQL_CONFIGURE_WITH= postgres PGSQL_USES= pgsql MYSQL_CONFIGURE_WITH= mysqlclient MYSQL_USE= MYSQL=yes VORBIS_CONFIGURE_WITH= ogg VORBIS_LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis RADIUS_CONFIGURE_WITH= radius RADIUS_LIB_DEPENDS= libradiusclient-ng.so:${PORTSDIR}/net/radiusclient SNMP_CONFIGURE_WITH= netsnmp SNMP_LIB_DEPENDS= libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp XMPP_CONFIGURE_WITH= iksemel XMPP_LIB_DEPENDS= libiksemel.so:${PORTSDIR}/textproc/iksemel SQLITE_CONFIGURE_WITH= sqlite SQLITE_LIB_DEPENDS= libsqlite.so:${PORTSDIR}/databases/sqlite2 GSM_CONFIGURE_WITH= gsm GSM_LIB_DEPENDS= libgsm.so:${PORTSDIR}/audio/gsm CURL_CONFIGURE_ON= --with-libcurl CURL_CONFIGURE_OFF= --with-libcurl=no CURL_LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl SPANDSP_CONFIGURE_WITH= spandsp SPANDSP_LIB_DEPENDS= libspandsp.so.2:${PORTSDIR}/comms/spandsp-devel EXCHANGE_CONFIGURE_OFF= --without-neon --without-neon29 EXCHANGE_LIB_DEPENDS= libneon.so:${PORTSDIR}/www/neon29 SRTP_CONFIGURE_WITH= srtp SRTP_BUILD_DEPENDS= libsrtp>=1.4.4:${PORTSDIR}/net/libsrtp LUA_CONFIGURE_WITH= lua LUA_USES= lua:51 LUA_CFLAGS= -I${LUA_INCDIR} LUA_LDFLAGS= -L${LUA_LIBDIR} LDAP_CONFIGURE_WITH= ldap LDAP_USE= OPENLDAP=yes ASTERISK_USER?= asterisk ASTERISK_GROUP?= asterisk USERS= ${ASTERISK_USER} GROUPS= ${ASTERISK_GROUP} dahdi .include .if ${PREFIX} == ${LOCALBASE} VARDIR=/var .else VARDIR=${PREFIX}/var .endif SUB_LIST+= ASTERISK_USER=${ASTERISK_USER} PLIST_SUB+= ASTERISK_USER=${ASTERISK_USER} PLIST_SUB+= ASTERISK_GROUP=${ASTERISK_GROUP} PLIST_SUB+= VARDIR=${VARDIR} post-extract: ${FIND} ${WRKSRC} -name '*.d' -delete post-patch: ${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/musiconhold.conf.sample post-configure: @cd ${WRKSRC} && ${MAKE_CMD} menuselect.makeopts @cd ${WRKSRC} && ./menuselect/menuselect --disable res_timing_kqueue menuselect.makeopts .if ${PORT_OPTIONS:MMYSQL} @cd ${WRKSRC} && ./menuselect/menuselect --enable res_config_mysql menuselect.makeopts @cd ${WRKSRC} && ./menuselect/menuselect --enable app_mysql menuselect.makeopts @cd ${WRKSRC} && ./menuselect/menuselect --enable cdr_mysql menuselect.makeopts .endif .if ${PORT_OPTIONS:MOOH323} @cd ${WRKSRC} && ./menuselect/menuselect --enable chan_ooh323 menuselect.makeopts .endif .if ${PORT_OPTIONS:MNEWG711} @cd ${WRKSRC} && ./menuselect/menuselect --enable G711_NEW_ALGORITHM menuselect.makeopts .endif post-install: @${RM} ${STAGEDIR}${ETCDIR}/*.conf ${STAGEDIR}${ETCDIR}/extensions.ael ${STAGEDIR}${ETCDIR}/extensions.lua .include Index: head/net/asterisk11/distinfo =================================================================== --- head/net/asterisk11/distinfo (revision 372447) +++ head/net/asterisk11/distinfo (revision 372448) @@ -1,2 +1,2 @@ -SHA256 (asterisk-11.13.1.tar.gz) = 382e914f3025f746d3a36cd218bc35f6a0f335b58226f35eaf4cc664b228d351 -SIZE (asterisk-11.13.1.tar.gz) = 34959077 +SHA256 (asterisk-11.14.0.tar.gz) = ad4710aba7f21c75bf1d16159a349034a04d3d36895243c262059a89f892098a +SIZE (asterisk-11.14.0.tar.gz) = 34975152 Index: head/net/asterisk11/files/asterisk.in =================================================================== --- head/net/asterisk11/files/asterisk.in (revision 372447) +++ head/net/asterisk11/files/asterisk.in (revision 372448) @@ -1,43 +1,56 @@ #!/bin/sh # # $FreeBSD$ # # PROVIDE: asterisk # REQUIRE: LOGIN # KEYWORD: shutdown # # Add the following lines to /etc/rc.conf to enable asterisk: # -# asterisk_enable="YES" +# asterisk_enable (bool): Set it to "YES" to enable asterisk +# Default is "NO" +# asterisk_user (string): User asterisk runs as +# Default is %%ASTERISK_USER%% +# asterisk_args (string): Extra argumeents to pass to asterisk at startup +# Default is "-n" +# asterisk_pidfile (string): Location of the asterisk pid file +# Default is /var/run/asterisk/asterisk.pid # . /etc/rc.subr name=asterisk rcvar=asterisk_enable +desc="Asterisk PBX server" -extra_commands="reload" +load_rc_config $name -stop_cmd="asterisk_stop" -reload_cmd="asterisk_reload" +: ${asterisk_enable:=NO} +: ${asterisk_user:=%%ASTERISK_USER%%} +: ${asterisk_args=-n} +: ${asterisk_pidfile:=/var/run/asterisk/asterisk.pid} +extra_commands=reload + +stop_cmd=asterisk_stop +reload_cmd=asterisk_reload + command="%%PREFIX%%/sbin/asterisk" -command_args="-n -F -U %%ASTERISK_USER%%" -pidfile=${asterisk_pidfile:-"/var/run/asterisk/asterisk.pid"} +command_args="${asterisk_args} -F -U ${asterisk_user}" +pidfile=${asterisk_pidfile} -asterisk_stop() { - echo 'Stopping asterisk' - $command -nqrx 'core stop now' +asterisk_stop() +{ + echo 'Stopping asterisk' + $command -nqrx 'core stop now' } -asterisk_reload() { - echo 'Reloading asterisk' - $command -nqrx 'reload' +asterisk_reload() +{ + echo 'Reloading asterisk' + $command -nqrx 'reload' } - -load_rc_config $name - -asterisk_enable=${asterisk_enable:-"NO"} run_rc_command "$1"