pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/comms/asterisk Update asterisk to version 1.2.1. Many...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/e853c1d48343
branches:  trunk
changeset: 506292:e853c1d48343
user:      riz <riz%pkgsrc.org@localhost>
date:      Fri Jan 13 20:32:38 2006 +0000

description:
Update asterisk to version 1.2.1.  Many, many bugfixes, and some
new features, including support for DUNDi.  (http://www.dundi.com/ for
more information)

The initial framework and porting of this package upgrade was done by
Martin J. Laubach, with lots of feature/PLIST fixes by me.  DragonFly
support added by Joerg Sonnenberger.

diffstat:

 comms/asterisk/Makefile         |   64 ++++-----
 comms/asterisk/PLIST.DragonFly  |    3 +-
 comms/asterisk/PLIST.FreeBSD    |    3 +-
 comms/asterisk/PLIST.Linux      |    3 +-
 comms/asterisk/PLIST.NetBSD     |    3 +-
 comms/asterisk/PLIST.OpenBSD    |    3 +-
 comms/asterisk/PLIST.common     |  122 +++++++++++++++++--
 comms/asterisk/PLIST.common_end |    4 +-
 comms/asterisk/distinfo         |   32 ++--
 comms/asterisk/options.mk       |    4 +-
 comms/asterisk/patches/patch-aa |  247 +++++++++++++++++++++++++--------------
 comms/asterisk/patches/patch-ab |   22 +-
 comms/asterisk/patches/patch-ac |   49 +++----
 comms/asterisk/patches/patch-ad |  195 +++++++++++++++++++-----------
 comms/asterisk/patches/patch-ae |   47 +++++--
 comms/asterisk/patches/patch-af |   49 +++++--
 comms/asterisk/patches/patch-ah |   13 --
 comms/asterisk/patches/patch-ai |   27 ++-
 comms/asterisk/patches/patch-aj |   10 +-
 comms/asterisk/patches/patch-ak |   15 +-
 comms/asterisk/patches/patch-al |   33 +++-
 comms/asterisk/patches/patch-am |   22 +-
 comms/asterisk/patches/patch-an |   13 ++
 23 files changed, 613 insertions(+), 370 deletions(-)

diffs (truncated from 1487 to 300 lines):

diff -r 0943436626f4 -r e853c1d48343 comms/asterisk/Makefile
--- a/comms/asterisk/Makefile   Fri Jan 13 20:04:48 2006 +0000
+++ b/comms/asterisk/Makefile   Fri Jan 13 20:32:38 2006 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2006/01/12 19:30:15 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2006/01/13 20:32:38 riz Exp $
 
-DISTNAME=      asterisk-1.0.9
-PKGREVISION=   1
+DISTNAME=      asterisk-1.2.1
 CATEGORIES=    comms net audio
 MASTER_SITES=  http://ftp.digium.com/pub/asterisk/ \
                http://ftp.digium.com/pub/asterisk/old-releases
@@ -10,13 +9,11 @@
 HOMEPAGE=      http://www.asterisk.org/
 COMMENT=       The Asterisk Software PBX
 
-USE_TOOLS+=    bison gmake
-
-MANCOMPRESSED= yes
+USE_TOOLS+=            bison gmake
 
-REPLACE_PERL+= agi/agi-test.agi
+# MANCOMPRESSED=               yes
 
-INSTALL_TARGET=        install samples
+INSTALL_TARGET=        install samples
 
 # Running as non-root will come later
 #ASTERISK_USER?=       asterisk
@@ -40,36 +37,39 @@
 ASTEXAMPLEDIR?=${PREFIX}/share/examples/asterisk
 
 # Override default paths in Makefile
-SUBST_CLASSES+=                asterisk
-SUBST_STAGE.asterisk=  pre-configure
+SUBST_CLASSES+=        asterisk
+SUBST_STAGE.asterisk=  pre-configure
 SUBST_FILES.asterisk=  Makefile
-SUBST_SED.asterisk=    \
-       -e 's|^\(ASTLIBDIR\)=.*|\1 = ${ASTLIBDIR}|'             \
-       -e 's|^\(ASTVARLIBDIR\)=.*|\1 = ${ASTVARLIBDIR}|'       \
-       -e 's|^\(ASTETCDIR\)=.*|\1 = ${ASTETCDIR}|'             \
-       -e 's|^\(ASTSPOOLDIR\)=.*|\1 = ${ASTSPOOLDIR}|'         \
-       -e 's|^\(ASTLOGDIR\)=.*|\1 = ${ASTLOGDIR}|'             \
-       -e 's|^\(ASTHEADERDIR\)=.*|\1 = ${ASTHEADERDIR}|'       \
-       -e 's|^\(ASTCONFPATH\)=.*|\1 = ${ASTCONFPATH}|'         \
-       -e 's|^\(ASTBINDIR\)=.*|\1 = ${ASTBINDIR}|'             \
-       -e 's|^\(ASTSBINDIR\)=.*|\1 = ${ASTSBINDIR}|'           \
-       -e 's|^\(ASTVARRUNDIR\)=.*|\1 = ${ASTVARRUNDIR}|'       \
-       -e 's|^\(ASTMANDIR\)=.*|\1 = ${ASTMANDIR}|'             \
-       -e 's|^\(ASTEXAMPLEDIR\)=.*|\1 = ${ASTEXAMPLEDIR}|'
+SUBST_SED.asterisk=    \
+       -e "s|^ *\(ASTLIBDIR\)=.*|\1 = ${ASTLIBDIR}|"           \
+       -e "s|^ *\(ASTVARLIBDIR\)=.*|\1 = ${ASTVARLIBDIR}|"     \
+       -e "s|^ *\(ASTETCDIR\)=.*|\1 = ${ASTETCDIR}|"           \
+       -e "s|^ *\(ASTSPOOLDIR\)=.*|\1 = ${ASTSPOOLDIR}|"               \
+       -e "s|^ *\(ASTLOGDIR\)=.*|\1 = ${ASTLOGDIR}|"           \
+       -e "s|^ *\(ASTHEADERDIR\)=.*|\1 = ${ASTHEADERDIR}|"     \
+       -e "s|^ *\(ASTCONFPATH\)=.*|\1 = ${ASTCONFPATH}|"               \
+       -e "s|^ *\(ASTBINDIR\)=.*|\1 = ${ASTBINDIR}|"           \
+       -e "s|^ *\(ASTSBINDIR\)=.*|\1 = ${ASTSBINDIR}|"         \
+       -e "s|^ *\(ASTVARRUNDIR\)=.*|\1 = ${ASTVARRUNDIR}|"     \
+       -e "s|^ *\(ASTMANDIR\)=.*|\1 = ${ASTMANDIR}|"           \
+       -e "s|^ *\(ASTEXAMPLEDIR\)=.*|\1 = ${ASTEXAMPLEDIR}|"
 
 .include "options.mk"
 
-RCD_SCRIPTS=           asterisk
-OWN_DIRS+=             ${ASTSPOOLDIR} ${ASTLOGDIR} ${ASTVARRUNDIR}
+USE_PKGINSTALL=        yes
+RCD_SCRIPTS=           asterisk
+OWN_DIRS+=             ${ASTSPOOLDIR} ${ASTLOGDIR} ${ASTVARRUNDIR}
 OWN_DIRS+=             ${ASTLOGDIR}/cdr-csv
 
 CONF_FILES=            # empty
-.for f in asterisk.conf extensions.conf
-CONF_FILES+=   ${ASTEXAMPLEDIR}/${f} ${ASTETCDIR}/${f}
+.for _file_ in asterisk.conf extensions.conf
+CONF_FILES+=   ${ASTEXAMPLEDIR}/${_file_} ${ASTETCDIR}/${_file_}
 .endfor
 
+MAKE_FLAGS+=   INSTALL_PREFIX=${PREFIX}
+ 
 # if we put all the files in $CONF_FILES, the message is _way_ too long.
-.for f in adsi.conf adtranvofr.conf agents.conf alarmreceiver.conf     \
+.for _file_ in adsi.conf adtranvofr.conf agents.conf alarmreceiver.conf \
        alsa.conf cdr_manager.conf cdr_odbc.conf                        \
        cdr_pgsql.conf cdr_tds.conf enum.conf extconfig.conf            \
        features.conf festival.conf iax.conf                            \
@@ -79,20 +79,16 @@
        res_config_odbc.conf res_odbc.conf rpt.conf rtp.conf sip.conf   \
        skinny.conf voicemail.conf vpb.conf zapata.conf asterisk.adsi   \
        telcordia-1.adsi
-CONF_FILES+=   ${ASTEXAMPLEDIR}/${f} ${ASTETCDIR}/${f}
+CONF_FILES+=   ${ASTEXAMPLEDIR}/${_file_} ${ASTETCDIR}/${_file_}
 .endfor
 
 PTHREAD_OPTS+= require native
 
 .if (${OPSYS} == "Darwin" && exists(/usr/include/sys/poll.h))
 post-patch:
-       ${ECHO} "#include <sys/poll.h>" > ${WRKSRC:Q}/include/asterisk/poll-compat.h
+       ${ECHO} "#include <sys/poll.h>" > ${WRKSRC}/include/asterisk/poll-compat.h
 .endif
 
-pre-configure:
-       @${CP} ${PKGSRCDIR:Q}/mk/gnu-config/config.guess ${WRKSRC:Q}/editline
-       @${CP} ${PKGSRCDIR:Q}/mk/gnu-config/config.sub ${WRKSRC:Q}/editline
-
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff -r 0943436626f4 -r e853c1d48343 comms/asterisk/PLIST.DragonFly
--- a/comms/asterisk/PLIST.DragonFly    Fri Jan 13 20:04:48 2006 +0000
+++ b/comms/asterisk/PLIST.DragonFly    Fri Jan 13 20:32:38 2006 +0000
@@ -1,3 +1,2 @@
-@comment $NetBSD: PLIST.DragonFly,v 1.1 2006/01/02 16:02:10 joerg Exp $
-lib/asterisk/modules/app_intercom.so
+@comment $NetBSD: PLIST.DragonFly,v 1.2 2006/01/13 20:32:38 riz Exp $
 lib/asterisk/modules/chan_oss.so
diff -r 0943436626f4 -r e853c1d48343 comms/asterisk/PLIST.FreeBSD
--- a/comms/asterisk/PLIST.FreeBSD      Fri Jan 13 20:04:48 2006 +0000
+++ b/comms/asterisk/PLIST.FreeBSD      Fri Jan 13 20:32:38 2006 +0000
@@ -1,3 +1,2 @@
-@comment $NetBSD: PLIST.FreeBSD,v 1.1.1.1 2005/04/08 03:10:52 riz Exp $
-lib/asterisk/modules/app_intercom.so
+@comment $NetBSD: PLIST.FreeBSD,v 1.2 2006/01/13 20:32:38 riz Exp $
 lib/asterisk/modules/chan_oss.so
diff -r 0943436626f4 -r e853c1d48343 comms/asterisk/PLIST.Linux
--- a/comms/asterisk/PLIST.Linux        Fri Jan 13 20:04:48 2006 +0000
+++ b/comms/asterisk/PLIST.Linux        Fri Jan 13 20:32:38 2006 +0000
@@ -1,3 +1,2 @@
-@comment $NetBSD: PLIST.Linux,v 1.1.1.1 2005/04/08 03:10:52 riz Exp $
-lib/asterisk/modules/app_intercom.so
+@comment $NetBSD: PLIST.Linux,v 1.2 2006/01/13 20:32:38 riz Exp $
 lib/asterisk/modules/chan_oss.so
diff -r 0943436626f4 -r e853c1d48343 comms/asterisk/PLIST.NetBSD
--- a/comms/asterisk/PLIST.NetBSD       Fri Jan 13 20:04:48 2006 +0000
+++ b/comms/asterisk/PLIST.NetBSD       Fri Jan 13 20:32:38 2006 +0000
@@ -1,3 +1,2 @@
-@comment $NetBSD: PLIST.NetBSD,v 1.1.1.1 2005/04/08 03:10:52 riz Exp $
-lib/asterisk/modules/app_intercom.so
+@comment $NetBSD: PLIST.NetBSD,v 1.2 2006/01/13 20:32:38 riz Exp $
 lib/asterisk/modules/chan_oss.so
diff -r 0943436626f4 -r e853c1d48343 comms/asterisk/PLIST.OpenBSD
--- a/comms/asterisk/PLIST.OpenBSD      Fri Jan 13 20:04:48 2006 +0000
+++ b/comms/asterisk/PLIST.OpenBSD      Fri Jan 13 20:32:38 2006 +0000
@@ -1,3 +1,2 @@
-@comment $NetBSD: PLIST.OpenBSD,v 1.1.1.1 2005/04/08 03:10:52 riz Exp $
-lib/asterisk/modules/app_intercom.so
+@comment $NetBSD: PLIST.OpenBSD,v 1.2 2006/01/13 20:32:38 riz Exp $
 lib/asterisk/modules/chan_oss.so
diff -r 0943436626f4 -r e853c1d48343 comms/asterisk/PLIST.common
--- a/comms/asterisk/PLIST.common       Fri Jan 13 20:04:48 2006 +0000
+++ b/comms/asterisk/PLIST.common       Fri Jan 13 20:32:38 2006 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.3 2005/09/02 12:58:34 adam Exp $
+@comment $NetBSD: PLIST.common,v 1.4 2006/01/13 20:32:38 riz Exp $
 include/asterisk/acl.h
 include/asterisk/adsi.h
 include/asterisk/aes.h
@@ -8,21 +8,28 @@
 include/asterisk/ast_expr.h
 include/asterisk/astdb.h
 include/asterisk/astmm.h
+include/asterisk/astobj.h
 include/asterisk/astosp.h
+include/asterisk/build.h
 include/asterisk/callerid.h
 include/asterisk/causes.h
 include/asterisk/cdr.h
 include/asterisk/channel.h
-include/asterisk/channel_pvt.h
+include/asterisk/chanspy.h
 include/asterisk/chanvars.h
 include/asterisk/cli.h
+include/asterisk/compat.h
+include/asterisk/compiler.h
 include/asterisk/config.h
-include/asterisk/config_pvt.h
 include/asterisk/crypto.h
-include/asterisk/cvsid.h
+include/asterisk/devicestate.h
 include/asterisk/dlfcn-compat.h
 include/asterisk/dns.h
+include/asterisk/dnsmgr.h
+include/asterisk/doxyref.h
 include/asterisk/dsp.h
+include/asterisk/dundi.h
+include/asterisk/endian.h
 include/asterisk/enum.h
 include/asterisk/features.h
 include/asterisk/file.h
@@ -30,6 +37,7 @@
 include/asterisk/fskmodem.h
 include/asterisk/image.h
 include/asterisk/indications.h
+include/asterisk/inline_api.h
 include/asterisk/io.h
 include/asterisk/linkedlists.h
 include/asterisk/localtime.h
@@ -40,36 +48,49 @@
 include/asterisk/module.h
 include/asterisk/monitor.h
 include/asterisk/musiconhold.h
+include/asterisk/netsock.h
 include/asterisk/options.h
 include/asterisk/pbx.h
+include/asterisk/plc.h
 include/asterisk/poll-compat.h
 include/asterisk/privacy.h
 include/asterisk/res_odbc.h
 include/asterisk/rtp.h
 include/asterisk/say.h
 include/asterisk/sched.h
+include/asterisk/slinfactory.h
 include/asterisk/srv.h
+include/asterisk/strings.h
 include/asterisk/tdd.h
 include/asterisk/term.h
+include/asterisk/time.h
+include/asterisk/transcap.h
 include/asterisk/translate.h
 include/asterisk/ulaw.h
+include/asterisk/unaligned.h
 include/asterisk/utils.h
+include/asterisk/version.h
 include/asterisk/vmodem.h
 lib/asterisk/modules/app_adsiprog.so
 lib/asterisk/modules/app_alarmreceiver.so
 lib/asterisk/modules/app_authenticate.so
 lib/asterisk/modules/app_cdr.so
 lib/asterisk/modules/app_chanisavail.so
+lib/asterisk/modules/app_chanspy.so
 lib/asterisk/modules/app_controlplayback.so
 lib/asterisk/modules/app_cut.so
 lib/asterisk/modules/app_db.so
 lib/asterisk/modules/app_dial.so
+lib/asterisk/modules/app_dictate.so
+lib/asterisk/modules/app_directed_pickup.so
 lib/asterisk/modules/app_directory.so
 lib/asterisk/modules/app_disa.so
+lib/asterisk/modules/app_dumpchan.so
 lib/asterisk/modules/app_echo.so
 lib/asterisk/modules/app_enumlookup.so
 lib/asterisk/modules/app_eval.so
 lib/asterisk/modules/app_exec.so
+lib/asterisk/modules/app_externalivr.so
 lib/asterisk/modules/app_festival.so
 lib/asterisk/modules/app_forkcdr.so
 lib/asterisk/modules/app_getcpeid.so
@@ -80,16 +101,20 @@
 lib/asterisk/modules/app_lookupblacklist.so
 lib/asterisk/modules/app_lookupcidname.so
 lib/asterisk/modules/app_macro.so
+lib/asterisk/modules/app_math.so
+lib/asterisk/modules/app_md5.so
 lib/asterisk/modules/app_milliwatt.so
+lib/asterisk/modules/app_mixmonitor.so
 lib/asterisk/modules/app_mp3.so
 lib/asterisk/modules/app_nbscat.so
 lib/asterisk/modules/app_parkandannounce.so
 lib/asterisk/modules/app_playback.so
 lib/asterisk/modules/app_privacy.so
-lib/asterisk/modules/app_qcall.so
 lib/asterisk/modules/app_queue.so
 lib/asterisk/modules/app_random.so
 lib/asterisk/modules/app_read.so
+lib/asterisk/modules/app_readfile.so
+lib/asterisk/modules/app_realtime.so
 lib/asterisk/modules/app_record.so
 lib/asterisk/modules/app_sayunixtime.so
 lib/asterisk/modules/app_senddtmf.so
@@ -98,10 +123,11 @@
 lib/asterisk/modules/app_setcdruserfield.so
 lib/asterisk/modules/app_setcidname.so
 lib/asterisk/modules/app_setcidnum.so
+lib/asterisk/modules/app_setrdnis.so
+lib/asterisk/modules/app_settransfercapability.so
 lib/asterisk/modules/app_sms.so
 lib/asterisk/modules/app_softhangup.so
-lib/asterisk/modules/app_striplsd.so
-lib/asterisk/modules/app_substring.so
+lib/asterisk/modules/app_stack.so
 lib/asterisk/modules/app_system.so
 lib/asterisk/modules/app_talkdetect.so
 lib/asterisk/modules/app_test.so
@@ -112,17 +138,17 @@
 lib/asterisk/modules/app_verbose.so
 lib/asterisk/modules/app_voicemail.so
 lib/asterisk/modules/app_waitforring.so
+lib/asterisk/modules/app_waitforsilence.so
+lib/asterisk/modules/app_while.so
 lib/asterisk/modules/app_zapateller.so
 lib/asterisk/modules/cdr_csv.so
+lib/asterisk/modules/cdr_custom.so
 lib/asterisk/modules/cdr_manager.so
 lib/asterisk/modules/chan_agent.so
+lib/asterisk/modules/chan_features.so



Home | Main Index | Thread Index | Old Index