diff options
author | riz <riz@pkgsrc.org> | 2006-01-13 20:32:38 +0000 |
---|---|---|
committer | riz <riz@pkgsrc.org> | 2006-01-13 20:32:38 +0000 |
commit | 28723e33e36f08953a17bcbe0e933b86f6c7fbac (patch) | |
tree | 68870952abc7c200609deaab377fbd49ee1464d2 | |
parent | 272ec6a7a10ee508aa961bbf460d94f43131df10 (diff) | |
download | pkgsrc-28723e33e36f08953a17bcbe0e933b86f6c7fbac.tar.gz |
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.
-rw-r--r-- | comms/asterisk/Makefile | 64 | ||||
-rw-r--r-- | comms/asterisk/PLIST.DragonFly | 3 | ||||
-rw-r--r-- | comms/asterisk/PLIST.FreeBSD | 3 | ||||
-rw-r--r-- | comms/asterisk/PLIST.Linux | 3 | ||||
-rw-r--r-- | comms/asterisk/PLIST.NetBSD | 3 | ||||
-rw-r--r-- | comms/asterisk/PLIST.OpenBSD | 3 | ||||
-rw-r--r-- | comms/asterisk/PLIST.common | 122 | ||||
-rw-r--r-- | comms/asterisk/PLIST.common_end | 4 | ||||
-rw-r--r-- | comms/asterisk/distinfo | 32 | ||||
-rw-r--r-- | comms/asterisk/options.mk | 4 | ||||
-rw-r--r-- | comms/asterisk/patches/patch-aa | 243 | ||||
-rw-r--r-- | comms/asterisk/patches/patch-ab | 22 | ||||
-rw-r--r-- | comms/asterisk/patches/patch-ac | 49 | ||||
-rw-r--r-- | comms/asterisk/patches/patch-ad | 195 | ||||
-rw-r--r-- | comms/asterisk/patches/patch-ae | 47 | ||||
-rw-r--r-- | comms/asterisk/patches/patch-af | 49 | ||||
-rw-r--r-- | comms/asterisk/patches/patch-ah | 13 | ||||
-rw-r--r-- | comms/asterisk/patches/patch-ai | 27 | ||||
-rw-r--r-- | comms/asterisk/patches/patch-aj | 10 | ||||
-rw-r--r-- | comms/asterisk/patches/patch-ak | 15 | ||||
-rw-r--r-- | comms/asterisk/patches/patch-al | 33 | ||||
-rw-r--r-- | comms/asterisk/patches/patch-am | 22 | ||||
-rw-r--r-- | comms/asterisk/patches/patch-an | 13 |
23 files changed, 611 insertions, 368 deletions
diff --git a/comms/asterisk/Makefile b/comms/asterisk/Makefile index d87b14c50eb..522fb0bd9a4 100644 --- a/comms/asterisk/Makefile +++ b/comms/asterisk/Makefile @@ -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 @@ MAINTAINER= riz@NetBSD.org HOMEPAGE= http://www.asterisk.org/ COMMENT= The Asterisk Software PBX -USE_TOOLS+= bison gmake +USE_TOOLS+= bison gmake -MANCOMPRESSED= yes +# MANCOMPRESSED= yes -REPLACE_PERL+= agi/agi-test.agi - -INSTALL_TARGET= install samples +INSTALL_TARGET= install samples # Running as non-root will come later #ASTERISK_USER?= asterisk @@ -40,36 +37,39 @@ ASTMANDIR?=${PREFIX}/man 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 @@ CONF_FILES+= ${ASTEXAMPLEDIR}/${f} ${ASTETCDIR}/${f} 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 --git a/comms/asterisk/PLIST.DragonFly b/comms/asterisk/PLIST.DragonFly index ddb9c403ba4..6a92ea09ce7 100644 --- a/comms/asterisk/PLIST.DragonFly +++ b/comms/asterisk/PLIST.DragonFly @@ -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 --git a/comms/asterisk/PLIST.FreeBSD b/comms/asterisk/PLIST.FreeBSD index 0e0b4273335..f19ae2d8584 100644 --- a/comms/asterisk/PLIST.FreeBSD +++ b/comms/asterisk/PLIST.FreeBSD @@ -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 --git a/comms/asterisk/PLIST.Linux b/comms/asterisk/PLIST.Linux index f4d56e0f0c9..d2d233cb134 100644 --- a/comms/asterisk/PLIST.Linux +++ b/comms/asterisk/PLIST.Linux @@ -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 --git a/comms/asterisk/PLIST.NetBSD b/comms/asterisk/PLIST.NetBSD index 56212632566..6dffc5da8c3 100644 --- a/comms/asterisk/PLIST.NetBSD +++ b/comms/asterisk/PLIST.NetBSD @@ -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 --git a/comms/asterisk/PLIST.OpenBSD b/comms/asterisk/PLIST.OpenBSD index 5b4c2a934c1..98d25b19049 100644 --- a/comms/asterisk/PLIST.OpenBSD +++ b/comms/asterisk/PLIST.OpenBSD @@ -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 --git a/comms/asterisk/PLIST.common b/comms/asterisk/PLIST.common index 54f7bfa6d2c..40e9a4ce94a 100644 --- a/comms/asterisk/PLIST.common +++ b/comms/asterisk/PLIST.common @@ -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/app.h 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/frame.h 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/md5.h 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_image.so 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_setcallerid.so 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_userevent.so 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 lib/asterisk/modules/chan_iax2.so lib/asterisk/modules/chan_local.so lib/asterisk/modules/chan_mgcp.so -lib/asterisk/modules/chan_modem.so -lib/asterisk/modules/chan_modem_aopen.so -lib/asterisk/modules/chan_modem_bestdata.so -lib/asterisk/modules/chan_modem_i4l.so lib/asterisk/modules/chan_sip.so lib/asterisk/modules/chan_skinny.so lib/asterisk/modules/codec_a_mu.so @@ -133,6 +159,8 @@ lib/asterisk/modules/codec_gsm.so lib/asterisk/modules/codec_ilbc.so lib/asterisk/modules/codec_lpc10.so lib/asterisk/modules/codec_ulaw.so +lib/asterisk/modules/format_au.so +lib/asterisk/modules/format_g723.so lib/asterisk/modules/format_g726.so lib/asterisk/modules/format_g729.so lib/asterisk/modules/format_gsm.so @@ -145,9 +173,16 @@ lib/asterisk/modules/format_sln.so lib/asterisk/modules/format_vox.so lib/asterisk/modules/format_wav.so lib/asterisk/modules/format_wav_gsm.so +lib/asterisk/modules/func_callerid.so +lib/asterisk/modules/func_enum.so +lib/asterisk/modules/func_uri.so +lib/asterisk/modules/pbx_ael.so lib/asterisk/modules/pbx_config.so +lib/asterisk/modules/pbx_dundi.so +lib/asterisk/modules/pbx_functions.so +lib/asterisk/modules/pbx_loopback.so +lib/asterisk/modules/pbx_realtime.so lib/asterisk/modules/pbx_spool.so -lib/asterisk/modules/pbx_wilcalu.so lib/asterisk/modules/res_adsi.so lib/asterisk/modules/res_agi.so lib/asterisk/modules/res_crypto.so @@ -158,6 +193,7 @@ lib/asterisk/modules/res_musiconhold.so ${GTK}lib/asterisk/modules/pbx_gtkconsole.so ${ZAPTEL}lib/asterisk/modules/app_flash.so ${ZAPTEL}lib/asterisk/modules/app_meetme.so +${ZAPTEL}lib/asterisk/modules/app_page.so ${ZAPTEL}lib/asterisk/modules/app_zapbarge.so ${ZAPTEL}lib/asterisk/modules/app_zapras.so ${ZAPTEL}lib/asterisk/modules/app_zapscan.so @@ -182,23 +218,34 @@ libdata/asterisk/sounds/agent-user.gsm libdata/asterisk/sounds/auth-incorrect.gsm libdata/asterisk/sounds/auth-thankyou.gsm libdata/asterisk/sounds/beep.gsm +libdata/asterisk/sounds/beeperr.gsm libdata/asterisk/sounds/conf-adminmenu.gsm libdata/asterisk/sounds/conf-enteringno.gsm libdata/asterisk/sounds/conf-errormenu.gsm libdata/asterisk/sounds/conf-getchannel.gsm libdata/asterisk/sounds/conf-getconfno.gsm libdata/asterisk/sounds/conf-getpin.gsm +libdata/asterisk/sounds/conf-hasjoin.gsm +libdata/asterisk/sounds/conf-hasleft.gsm libdata/asterisk/sounds/conf-invalid.gsm libdata/asterisk/sounds/conf-invalidpin.gsm libdata/asterisk/sounds/conf-kicked.gsm +libdata/asterisk/sounds/conf-leaderhasleft.gsm libdata/asterisk/sounds/conf-locked.gsm libdata/asterisk/sounds/conf-lockednow.gsm libdata/asterisk/sounds/conf-muted.gsm libdata/asterisk/sounds/conf-noempty.gsm +libdata/asterisk/sounds/conf-onlyone.gsm libdata/asterisk/sounds/conf-onlyperson.gsm +libdata/asterisk/sounds/conf-otherinparty.gsm +libdata/asterisk/sounds/conf-placeintoconf.gsm +libdata/asterisk/sounds/conf-thereare.gsm libdata/asterisk/sounds/conf-unlockednow.gsm libdata/asterisk/sounds/conf-unmuted.gsm libdata/asterisk/sounds/conf-usermenu.gsm +libdata/asterisk/sounds/conf-userswilljoin.gsm +libdata/asterisk/sounds/conf-userwilljoin.gsm +libdata/asterisk/sounds/conf-waitforleader.gsm libdata/asterisk/sounds/demo-abouttotry.gsm libdata/asterisk/sounds/demo-congrats.gsm libdata/asterisk/sounds/demo-echodone.gsm @@ -209,6 +256,18 @@ libdata/asterisk/sounds/demo-moreinfo.gsm libdata/asterisk/sounds/demo-nogo.gsm libdata/asterisk/sounds/demo-nomatch.gsm libdata/asterisk/sounds/demo-thanks.gsm +libdata/asterisk/sounds/dictate/both_help.gsm +libdata/asterisk/sounds/dictate/enter_filename.gsm +libdata/asterisk/sounds/dictate/forhelp.gsm +libdata/asterisk/sounds/dictate/pause.gsm +libdata/asterisk/sounds/dictate/paused.gsm +libdata/asterisk/sounds/dictate/play_help.gsm +libdata/asterisk/sounds/dictate/playback.gsm +libdata/asterisk/sounds/dictate/playback_mode.gsm +libdata/asterisk/sounds/dictate/record.gsm +libdata/asterisk/sounds/dictate/record_help.gsm +libdata/asterisk/sounds/dictate/record_mode.gsm +libdata/asterisk/sounds/dictate/truncating_audio.gsm libdata/asterisk/sounds/digits/0.gsm libdata/asterisk/sounds/digits/1.gsm libdata/asterisk/sounds/digits/10.gsm @@ -297,6 +356,7 @@ libdata/asterisk/sounds/dir-intro-fn.gsm libdata/asterisk/sounds/dir-intro.gsm libdata/asterisk/sounds/dir-nomatch.gsm libdata/asterisk/sounds/dir-nomore.gsm +libdata/asterisk/sounds/hello-world.gsm libdata/asterisk/sounds/invalid.gsm libdata/asterisk/sounds/letters/a.gsm libdata/asterisk/sounds/letters/at.gsm @@ -364,6 +424,10 @@ libdata/asterisk/sounds/phonetic/w_p.gsm libdata/asterisk/sounds/phonetic/x_p.gsm libdata/asterisk/sounds/phonetic/y_p.gsm libdata/asterisk/sounds/phonetic/z_p.gsm +libdata/asterisk/sounds/priv-callee-options.gsm +libdata/asterisk/sounds/priv-callpending.gsm +libdata/asterisk/sounds/priv-introsaved.gsm +libdata/asterisk/sounds/priv-recordintro.gsm libdata/asterisk/sounds/privacy-incorrect.gsm libdata/asterisk/sounds/privacy-prompt.gsm libdata/asterisk/sounds/privacy-thankyou.gsm @@ -372,10 +436,21 @@ libdata/asterisk/sounds/queue-callswaiting.gsm libdata/asterisk/sounds/queue-holdtime.gsm libdata/asterisk/sounds/queue-less-than.gsm libdata/asterisk/sounds/queue-minutes.gsm +libdata/asterisk/sounds/queue-periodic-announce.gsm +libdata/asterisk/sounds/queue-reporthold.gsm libdata/asterisk/sounds/queue-seconds.gsm libdata/asterisk/sounds/queue-thankyou.gsm libdata/asterisk/sounds/queue-thereare.gsm libdata/asterisk/sounds/queue-youarenext.gsm +libdata/asterisk/sounds/screen-callee-options.gsm +libdata/asterisk/sounds/spy-agent.gsm +libdata/asterisk/sounds/spy-h323.gsm +libdata/asterisk/sounds/spy-iax.gsm +libdata/asterisk/sounds/spy-iax2.gsm +libdata/asterisk/sounds/spy-mgcp.gsm +libdata/asterisk/sounds/spy-sip.gsm +libdata/asterisk/sounds/spy-skinny.gsm +libdata/asterisk/sounds/spy-zap.gsm libdata/asterisk/sounds/ss-noservice.gsm libdata/asterisk/sounds/transfer.gsm libdata/asterisk/sounds/tt-allbusy.gsm @@ -383,7 +458,6 @@ libdata/asterisk/sounds/tt-monkeys.gsm libdata/asterisk/sounds/tt-monkeysintro.gsm libdata/asterisk/sounds/tt-somethingwrong.gsm libdata/asterisk/sounds/tt-weasels.gsm -libdata/asterisk/sounds/vm libdata/asterisk/sounds/vm-Cust1.gsm libdata/asterisk/sounds/vm-Cust2.gsm libdata/asterisk/sounds/vm-Cust3.gsm @@ -405,6 +479,7 @@ libdata/asterisk/sounds/vm-enter-num-to-call.gsm libdata/asterisk/sounds/vm-extension.gsm libdata/asterisk/sounds/vm-first.gsm libdata/asterisk/sounds/vm-for.gsm +libdata/asterisk/sounds/vm-forward.gsm libdata/asterisk/sounds/vm-forwardoptions.gsm libdata/asterisk/sounds/vm-from-extension.gsm libdata/asterisk/sounds/vm-from-phonenumber.gsm @@ -423,10 +498,12 @@ libdata/asterisk/sounds/vm-login.gsm libdata/asterisk/sounds/vm-mailboxfull.gsm libdata/asterisk/sounds/vm-message.gsm libdata/asterisk/sounds/vm-messages.gsm +libdata/asterisk/sounds/vm-minutes.gsm libdata/asterisk/sounds/vm-mismatch.gsm libdata/asterisk/sounds/vm-msginstruct.gsm libdata/asterisk/sounds/vm-msgsaved.gsm libdata/asterisk/sounds/vm-newpassword.gsm +libdata/asterisk/sounds/vm-newuser.gsm libdata/asterisk/sounds/vm-next.gsm libdata/asterisk/sounds/vm-no.gsm libdata/asterisk/sounds/vm-nobodyavail.gsm @@ -444,6 +521,7 @@ libdata/asterisk/sounds/vm-prev.gsm libdata/asterisk/sounds/vm-reachoper.gsm libdata/asterisk/sounds/vm-rec-busy.gsm libdata/asterisk/sounds/vm-rec-name.gsm +libdata/asterisk/sounds/vm-rec-temp.gsm libdata/asterisk/sounds/vm-rec-unv.gsm libdata/asterisk/sounds/vm-received.gsm libdata/asterisk/sounds/vm-reenterpassword.gsm @@ -457,6 +535,9 @@ libdata/asterisk/sounds/vm-saveoper.gsm libdata/asterisk/sounds/vm-sorry.gsm libdata/asterisk/sounds/vm-star-cancel.gsm libdata/asterisk/sounds/vm-starmain.gsm +libdata/asterisk/sounds/vm-tempgreeting.gsm +libdata/asterisk/sounds/vm-tempgreeting2.gsm +libdata/asterisk/sounds/vm-tempremoved.gsm libdata/asterisk/sounds/vm-then-pound.gsm libdata/asterisk/sounds/vm-theperson.gsm libdata/asterisk/sounds/vm-tocallback.gsm @@ -477,10 +558,16 @@ libdata/asterisk/sounds/vm-whichbox.gsm libdata/asterisk/sounds/vm-youhave.gsm libdata/asterisk/sounds/voicemail man/man8/asterisk.8 +man/man8/astgenkey.8 +man/man8/autosupport.8 +man/man8/safe_asterisk.8 sbin/asterisk sbin/astgenkey sbin/autosupport sbin/safe_asterisk +sbin/rasterisk +sbin/stereorize +sbin/streamplayer share/examples/asterisk/adsi.conf share/examples/asterisk/adtranvofr.conf share/examples/asterisk/agents.conf @@ -488,12 +575,18 @@ share/examples/asterisk/alarmreceiver.conf share/examples/asterisk/alsa.conf share/examples/asterisk/asterisk.adsi share/examples/asterisk/asterisk.conf +share/examples/asterisk/cdr.conf +share/examples/asterisk/cdr_custom.conf share/examples/asterisk/cdr_manager.conf share/examples/asterisk/cdr_odbc.conf share/examples/asterisk/cdr_pgsql.conf share/examples/asterisk/cdr_tds.conf +share/examples/asterisk/codecs.conf +share/examples/asterisk/dnsmgr.conf +share/examples/asterisk/dundi.conf share/examples/asterisk/enum.conf share/examples/asterisk/extconfig.conf +share/examples/asterisk/extensions.ael share/examples/asterisk/extensions.conf share/examples/asterisk/features.conf share/examples/asterisk/festival.conf @@ -504,6 +597,7 @@ share/examples/asterisk/logger.conf share/examples/asterisk/manager.conf share/examples/asterisk/meetme.conf share/examples/asterisk/mgcp.conf +share/examples/asterisk/misdn.conf share/examples/asterisk/modem.conf share/examples/asterisk/modules.conf share/examples/asterisk/musiconhold.conf @@ -512,11 +606,11 @@ share/examples/asterisk/oss.conf share/examples/asterisk/phone.conf share/examples/asterisk/privacy.conf share/examples/asterisk/queues.conf -share/examples/asterisk/res_config_odbc.conf share/examples/asterisk/res_odbc.conf share/examples/asterisk/rpt.conf share/examples/asterisk/rtp.conf share/examples/asterisk/sip.conf +share/examples/asterisk/sip_notify.conf share/examples/asterisk/skinny.conf share/examples/asterisk/telcordia-1.adsi share/examples/asterisk/voicemail.conf diff --git a/comms/asterisk/PLIST.common_end b/comms/asterisk/PLIST.common_end index 98157931b26..6e2944ff4a4 100644 --- a/comms/asterisk/PLIST.common_end +++ b/comms/asterisk/PLIST.common_end @@ -1,8 +1,10 @@ -@comment $NetBSD: PLIST.common_end,v 1.2 2005/09/02 12:58:34 adam Exp $ +@comment $NetBSD: PLIST.common_end,v 1.3 2006/01/13 20:32:38 riz Exp $ @dirrm share/examples/asterisk +@dirrm libdata/asterisk/sounds/priv-callerintros @dirrm libdata/asterisk/sounds/phonetic @dirrm libdata/asterisk/sounds/letters @dirrm libdata/asterisk/sounds/digits +@dirrm libdata/asterisk/sounds/dictate @dirrm libdata/asterisk/sounds @dirrm libdata/asterisk/mohmp3 @dirrm libdata/asterisk/keys diff --git a/comms/asterisk/distinfo b/comms/asterisk/distinfo index a92aebed08d..21a3afd440e 100644 --- a/comms/asterisk/distinfo +++ b/comms/asterisk/distinfo @@ -1,18 +1,18 @@ -$NetBSD: distinfo,v 1.6 2006/01/02 16:02:10 joerg Exp $ +$NetBSD: distinfo,v 1.7 2006/01/13 20:32:38 riz Exp $ -SHA1 (asterisk-1.0.9.tar.gz) = 62edb29222e4a801893d1f23b73def8555ac2c47 -RMD160 (asterisk-1.0.9.tar.gz) = 2e48dc00a3c290cc6b418ab0aee42feb93d9e76a -Size (asterisk-1.0.9.tar.gz) = 9604582 bytes -SHA1 (patch-aa) = 5f43557b028b97780889512bba6bba66b88a4b6d -SHA1 (patch-ab) = 435a76cd7bad98b0809fa47b5b79530767027aa9 -SHA1 (patch-ac) = e6aad8435be3c616112afec59b968c29721d98e3 -SHA1 (patch-ad) = c19da2acb25c8fe68882d222d4f5dcb1be75cf63 -SHA1 (patch-ae) = 9069d535ac150b1715694e45658540624d512583 -SHA1 (patch-af) = 658aba06be8869403f37e5cb41b44934be585c7d +SHA1 (asterisk-1.2.1.tar.gz) = aab351702d85a37ef9aefb8272f5f5d62fd791a3 +RMD160 (asterisk-1.2.1.tar.gz) = 68c96a098b4c52a096daad45ed19431c75fe1894 +Size (asterisk-1.2.1.tar.gz) = 10517194 bytes +SHA1 (patch-aa) = b5b6dc32051bcf5c0a894e74f2989c9a7923d8e8 +SHA1 (patch-ab) = 1bdae0ff206b63fe63373a307ecd23859c10cb79 +SHA1 (patch-ac) = 4f783699c7d701030788646f8b961fa9245dc127 +SHA1 (patch-ad) = e1309faffe1aee9c3854cdc5862e52aa6d110305 +SHA1 (patch-ae) = 9b7b2ed60d79aab3e2653d97409067c17cd342b4 +SHA1 (patch-af) = 33c03a4ae531296b2b4e60713e33d7491fff504d SHA1 (patch-ag) = 3e6ce8f463df94fe9cba8fa8dbe03eda408aa581 -SHA1 (patch-ah) = 42f82093a325ae8127c47b2a9506ea0f8f8b8fae -SHA1 (patch-ai) = dc5ed7e20d63e08d80a2cd0b630491c594d5fa33 -SHA1 (patch-aj) = 354578b1499f2ebbd87ef765c7d30e79d383a54a -SHA1 (patch-ak) = c8d6bb6d14098fec81d5cffd70fc443ff1449925 -SHA1 (patch-al) = 67d14e73a36c77c48031f0e86105a4d965afb755 -SHA1 (patch-am) = e03fb0c7aec476136dfcaa41cdd4d7e5517b7644 +SHA1 (patch-ai) = 81c0ff8f8a273562a64ab7cfb301d578e18808e3 +SHA1 (patch-aj) = 9111528ac9702040233308c655e5233120ee9bcf +SHA1 (patch-ak) = 3027134258138ca9163d9569548c7d4faffb874f +SHA1 (patch-al) = 1457c9a12eb5c5621eb244423c2190fb430866e7 +SHA1 (patch-am) = a652b091462673390e19ab47e17500d055779094 +SHA1 (patch-an) = 5bfb86853e868bc78eb0061871f4abce0df1ba2c diff --git a/comms/asterisk/options.mk b/comms/asterisk/options.mk index 68e7c2731bb..6949ce7aec5 100644 --- a/comms/asterisk/options.mk +++ b/comms/asterisk/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1.1.1 2005/04/08 03:10:52 riz Exp $ +# $NetBSD: options.mk,v 1.2 2006/01/13 20:32:38 riz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.asterisk PKG_SUPPORTED_OPTIONS= zaptel gtk @@ -7,9 +7,9 @@ PKG_SUPPORTED_OPTIONS= zaptel gtk .if !empty(PKG_OPTIONS:Mzaptel) # zaptel only supported under NetBSD at the moment . include "../../comms/zaptel-netbsd/buildlink3.mk" -MAKE_FLAGS+= ASTERISK_USE_ZAPTEL=1 PLIST_SUBST+= ZAPTEL= .else +MAKE_FLAGS+= WITHOUT_ZAPTEL=1 PLIST_SUBST+= ZAPTEL="@comment " .endif diff --git a/comms/asterisk/patches/patch-aa b/comms/asterisk/patches/patch-aa index d866b1872f7..8098de0486d 100644 --- a/comms/asterisk/patches/patch-aa +++ b/comms/asterisk/patches/patch-aa @@ -1,115 +1,188 @@ -$NetBSD: patch-aa,v 1.5 2006/01/02 16:02:10 joerg Exp $ +$NetBSD: patch-aa,v 1.6 2006/01/13 20:32:38 riz Exp $ ---- Makefile.orig 2005-04-26 14:30:23.000000000 +0000 +--- Makefile.orig 2005-12-05 06:47:51.000000000 +0000 +++ Makefile -@@ -42,7 +42,11 @@ MPG123TARG=linux - endif +@@ -106,31 +106,32 @@ BUSYDETECT+= #-DBUSYDETECT_TONEONLY + BUSYDETECT+= #-DBUSYDETECT_COMPARE_TONE_AND_SILENCE - ifeq ($(findstring BSD,${OSARCH}),BSD) --PROC=$(shell uname -m) -+PROC=$(shell uname -p) -+endif -+ -+ifeq (${OSARCH},DragonFly) -+PROC=$(shell uname -p) + ifneq ($(OSARCH),SunOS) +- ASTLIBDIR=$(INSTALL_PREFIX)/usr/lib/asterisk +- ASTVARLIBDIR=$(INSTALL_PREFIX)/var/lib/asterisk +- ASTETCDIR=$(INSTALL_PREFIX)/etc/asterisk +- ASTSPOOLDIR=$(INSTALL_PREFIX)/var/spool/asterisk +- ASTLOGDIR=$(INSTALL_PREFIX)/var/log/asterisk +- ASTHEADERDIR=$(INSTALL_PREFIX)/usr/include/asterisk +- ASTCONFPATH=$(ASTETCDIR)/asterisk.conf +- ASTBINDIR=$(INSTALL_PREFIX)/usr/bin +- ASTSBINDIR=$(INSTALL_PREFIX)/usr/sbin +- ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run +- ASTMANDIR=$(INSTALL_PREFIX)/usr/share/man ++ASTLIBDIR = /usr/pkg/lib/asterisk ++ASTVARLIBDIR = /usr/pkg/libdata/asterisk ++ASTETCDIR = /usr/pkg/etc/asterisk ++ASTSPOOLDIR = /var/spool/asterisk ++ASTLOGDIR = /var/log/asterisk ++ASTHEADERDIR = /usr/pkg/include/asterisk ++ASTCONFPATH = /usr/pkg/etc/asterisk/asterisk.conf ++ASTBINDIR = /usr/pkg/bin ++ASTSBINDIR = /usr/pkg/sbin ++ASTVARRUNDIR = /var/run ++ASTMANDIR = /usr/pkg/man ++ ASTEXAMPLEDIR?=${PREFIX}/share/examples/asterisk + MODULES_DIR=$(ASTLIBDIR)/modules + AGI_DIR=$(ASTVARLIBDIR)/agi-bin + else +- ASTLIBDIR=$(INSTALL_PREFIX)/opt/asterisk/lib +- ASTVARLIBDIR=$(INSTALL_PREFIX)/var/opt/asterisk/lib +- ASTETCDIR=$(INSTALL_PREFIX)/etc/opt/asterisk +- ASTSPOOLDIR=$(INSTALL_PREFIX)/var/opt/asterisk/spool +- ASTLOGDIR=$(INSTALL_PREFIX)/var/opt/asterisk/log +- ASTHEADERDIR=$(INSTALL_PREFIX)/opt/asterisk/usr/include/asterisk +- ASTCONFPATH=$(ASTETCDIR)/asterisk.conf +- ASTBINDIR=$(INSTALL_PREFIX)/opt/asterisk/usr/bin +- ASTSBINDIR=$(INSTALL_PREFIX)/opt/asterisk/usr/sbin +- ASTVARRUNDIR=$(INSTALL_PREFIX)/var/opt/asterisk/run +- ASTMANDIR=$(INSTALL_PREFIX)/opt/asterisk/usr/share/man ++ASTLIBDIR = /usr/pkg/lib/asterisk ++ASTVARLIBDIR = /usr/pkg/libdata/asterisk ++ASTETCDIR = /usr/pkg/etc/asterisk ++ASTSPOOLDIR = /var/spool/asterisk ++ASTLOGDIR = /var/log/asterisk ++ASTHEADERDIR = /usr/pkg/include/asterisk ++ASTCONFPATH = /usr/pkg/etc/asterisk/asterisk.conf ++ASTBINDIR = /usr/pkg/bin ++ASTSBINDIR = /usr/pkg/sbin ++ASTVARRUNDIR = /var/run ++ASTMANDIR = /usr/pkg/man + MODULES_DIR=$(ASTLIBDIR)/modules + AGI_DIR=$(ASTVARLIBDIR)/agi-bin endif +@@ -223,7 +224,7 @@ ASTCFLAGS+=$(OPTIMIZE) + ASTOBJ=-o asterisk - # Pentium Pro Optimize -@@ -122,6 +122,7 @@ ASTBINDIR=$(INSTALL_PREFIX)/usr/bin - ASTSBINDIR=$(INSTALL_PREFIX)/usr/sbin - ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run - ASTMANDIR=$(INSTALL_PREFIX)/usr/share/man -+ASTEXAMPLEDIR=${PREFIX}/share/examples/asterisk + ifeq ($(findstring BSD,$(OSARCH)),BSD) +- PROC=$(shell uname -m) ++ PROC=$(shell uname -p) + ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib + endif - MODULES_DIR=$(ASTLIBDIR)/modules - AGI_DIR=$(ASTVARLIBDIR)/agi-bin -@@ -148,7 +153,7 @@ endif # FreeBSD +@@ -254,24 +255,24 @@ ifeq ($(OSARCH),FreeBSD) - ifeq (${OSARCH},NetBSD) - CFLAGS+=-pthread --INCLUDE+=-I/usr/local/include -I/usr/pkg/include -+INCLUDE+=-I${PREFIX}/include - MPG123TARG=netbsd - endif + # XXX FreeBSD paths + PREFIX?=/usr/local +- ASTLIBDIR=$(INSTALL_PREFIX)$(PREFIX)/lib/asterisk +- ASTVARLIBDIR=$(INSTALL_PREFIX)$(PREFIX)/share/asterisk +- ASTETCDIR=$(INSTALL_PREFIX)$(PREFIX)/etc/asterisk +- ASTSPOOLDIR=$(INSTALL_PREFIX)/var/spool/asterisk +- ASTLOGDIR=$(INSTALL_PREFIX)/var/log/asterisk +- ASTHEADERDIR=$(INSTALL_PREFIX)$(PREFIX)/include/asterisk +- ASTCONFPATH=$(ASTETCDIR)/asterisk.conf +- ASTBINDIR=$(INSTALL_PREFIX)$(PREFIX)/bin +- ASTSBINDIR=$(INSTALL_PREFIX)$(PREFIX)/sbin +- ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run +- ASTMANDIR=$(INSTALL_PREFIX)$(PREFIX)/man ++ASTLIBDIR = /usr/pkg/lib/asterisk ++ASTVARLIBDIR = /usr/pkg/libdata/asterisk ++ASTETCDIR = /usr/pkg/etc/asterisk ++ASTSPOOLDIR = /var/spool/asterisk ++ASTLOGDIR = /var/log/asterisk ++ASTHEADERDIR = /usr/pkg/include/asterisk ++ASTCONFPATH = /usr/pkg/etc/asterisk/asterisk.conf ++ASTBINDIR = /usr/pkg/bin ++ASTSBINDIR = /usr/pkg/sbin ++ASTVARRUNDIR = /var/run ++ASTMANDIR = /usr/pkg/man + # XXX end FreeBSD paths -@@ -159,8 +164,11 @@ endif - #Uncomment this to use the older DSP routines - #CFLAGS+=-DOLD_DSP_ROUTINES + endif # FreeBSD --CFLAGS+=$(shell if [ -f /usr/include/linux/zaptel.h ]; then echo "-DZAPTEL_OPTIMIZATIONS"; fi) --CFLAGS+=$(shell if [ -f /usr/local/include/zaptel.h ]; then echo "-DZAPTEL_OPTIMIZATIONS"; fi) -+#CFLAGS+=$(shell if [ -f /usr/include/linux/zaptel.h ]; then echo "-DZAPTEL_OPTIMIZATIONS"; fi) -+#CFLAGS+=$(shell if [ -f /usr/local/include/zaptel.h ]; then echo "-DZAPTEL_OPTIMIZATIONS"; fi) -+ifdef ASTERISK_USE_ZAPTEL -+CFLAGS+=-DZAPTEL_OPTIMIZATIONS -+endif + ifeq ($(OSARCH),NetBSD) + ASTCFLAGS+=-pthread +- INCLUDE+=-I$(CROSS_COMPILE_TARGET)/usr/pkg/include ++ INCLUDE+=-I${PREFIX}/include + MPG123TARG=netbsd + endif - LIBEDIT=editline/libedit.a +@@ -290,7 +291,7 @@ ifeq ($(findstring CYGWIN,$(OSARCH)),CYG + ASTOBJ=-shared -o asterisk.dll -Wl,--out-implib=libasterisk.dll.a -Wl,--export-all-symbols + ASTLINK= + LIBS+=-lpthread -lncurses -lm -lresolv +- ASTSBINDIR=$(MODULES_DIR) ++ASTSBINDIR = /usr/pkg/sbin + PROC=$(shell uname -m) + endif -@@ -200,7 +208,10 @@ ifeq (${OSARCH},FreeBSD) - LIBS+=-lcrypto +@@ -367,7 +368,8 @@ ifeq ($(OSARCH),Darwin) + AUDIO_LIBS=-framework CoreAudio + ASTLINK=-Wl,-dynamic + SOLINK=-dynamic -bundle -undefined suppress -force_flat_namespace +- OBJS+= poll.o ++ OBJS+=dlfcn.o ++ OBJS+=$(shell if [ -e /usr/include/sys/poll.h ]; then echo -n "" ; else echo poll.o; fi) + ASTCFLAGS+=-DPOLLCOMPAT + else + #These are used for all but Darwin +@@ -379,8 +381,12 @@ ifeq ($(OSARCH),FreeBSD) + LIBS+=-lcrypto endif - ifeq (${OSARCH},NetBSD) --LIBS+=-lpthread -lcrypto -lm -L/usr/local/lib -L/usr/pkg/lib -lncurses -+LIBS+=-lpthread -lcrypto -lm -L${PREFIX}/lib -R${PREFIX}/lib -lncurses + ++ifeq ($(OSARCH),DragonFly) ++ LIBS+=-lcrypto -pthread +endif -+ifeq (${OSARCH},DragonFly) -+LIBS+=-pthread -lcrypto -lm -L${PREFIX}/lib -R${PREFIX}/lib -lncurses ++ + ifeq ($(OSARCH),NetBSD) +- LIBS+=-lpthread -lcrypto -lm -L$(CROSS_COMPILE_TARGET)/usr/pkg/lib -lncurses ++ LIBS+=-lpthread -lcrypto -lm -L${PREFIX}/lib -R${PREFIX}/lib -lncurses endif - ifeq (${OSARCH},OpenBSD) - LIBS=-lcrypto -lpthread -lm -lncurses -@@ -214,7 +225,8 @@ OBJS=io.o sched.o logger.o frame.o loade - astmm.o enum.o srv.o dns.o aescrypt.o aestab.o aeskey.o \ - utils.o - ifeq (${OSARCH},Darwin) --OBJS+=poll.o dlfcn.o -+OBJS+=dlfcn.o -+OBJS+=$(shell if [ -e /usr/include/sys/poll.h ]; then echo -n "" ; else echo poll.o; fi) - ASTLINK=-Wl,-dynamic - SOLINK=-dynamic -bundle -undefined suppress -force_flat_namespace - else -@@ -450,29 +462,29 @@ install: all datafiles bininstall + + ifeq ($(OSARCH),OpenBSD) +@@ -718,31 +724,31 @@ install: all datafiles bininstall upgrade: all bininstall - adsi: all + adsi: - mkdir -p $(DESTDIR)$(ASTETCDIR) + mkdir -p $(DESTDIR)$(ASTEXAMPLEDIR) for x in configs/*.adsi; do \ -- if ! [ -f $(DESTDIR)$(ASTETCDIRX)/$$x ]; then \ -- install -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x` ; \ +- if [ ! -f $(DESTDIR)$(ASTETCDIRX)/$$x ]; then \ +- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x` ; \ + if ! [ -f $(DESTDIR)$(ASTEXAMPLEDIR)/$$x ]; then \ -+ install -m 644 $$x $(DESTDIR)$(ASTEXAMPLEDIR)/`basename $$x` ; \ ++ $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTEXAMPLEDIR)/`basename $$x` ; \ fi ; \ done - samples: all datafiles adsi + samples: adsi - mkdir -p $(DESTDIR)$(ASTETCDIR) + mkdir -p $(DESTDIR)$(ASTEXAMPLEDIR) for x in configs/*.sample; do \ - if [ -f $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ]; then \ -- mv -f $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample`.old ; \ + if [ -f $(DESTDIR)$(ASTEXAMPLEDIR)/`basename $$x .sample` ]; then \ -+ mv -f $(DESTDIR)$(ASTEXAMPLEDIR)/`basename $$x .sample` $(DESTDIR)$(ASTEXAMPLEDIR)/`basename $$x .sample`.old ; \ + if [ "$(OVERWRITE)" = "y" ]; then \ +- if cmp -s $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` $$x ; then \ ++ if cmp -s $(DESTDIR)$(ASTEXAMPLEDIR)/`basename $$x .sample` $$x ; then \ + echo "Config file $$x is unchanged"; \ + continue; \ + fi ; \ +- mv -f $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample`.old ; \ ++ mv -f $(DESTDIR)$(ASTEXAMPLEDIR)/`basename $$x .sample` $(DESTDIR)$(ASTEXAMPLEDIR)/`basename $$x .sample`.old ; \ + else \ + echo "Skipping config file $$x"; \ + continue; \ + fi ;\ fi ; \ -- install -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ;\ -+ install -m 644 $$x $(DESTDIR)$(ASTEXAMPLEDIR)/`basename $$x .sample` ;\ +- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ;\ ++ $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTEXAMPLEDIR)/`basename $$x .sample` ;\ done -- echo "[directories]" > $(DESTDIR)$(ASTETCDIR)/asterisk.conf -- echo "astetcdir => $(ASTETCDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf -- echo "astmoddir => $(MODULES_DIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf -- echo "astvarlibdir => $(ASTVARLIBDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf -- echo "astagidir => $(AGI_DIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf -- echo "astspooldir => $(ASTSPOOLDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf -- echo "astrundir => $(ASTVARRUNDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf -- echo "astlogdir => $(ASTLOGDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf -+ echo "[directories]" > $(DESTDIR)$(ASTEXAMPLEDIR)/asterisk.conf -+ echo "astetcdir => $(ASTETCDIR)" >> $(DESTDIR)$(ASTEXAMPLEDIR)/asterisk.conf -+ echo "astmoddir => $(MODULES_DIR)" >> $(DESTDIR)$(ASTEXAMPLEDIR)/asterisk.conf -+ echo "astvarlibdir => $(ASTVARLIBDIR)" >> $(DESTDIR)$(ASTEXAMPLEDIR)/asterisk.conf -+ echo "astagidir => $(AGI_DIR)" >> $(DESTDIR)$(ASTEXAMPLEDIR)/asterisk.conf -+ echo "astspooldir => $(ASTSPOOLDIR)" >> $(DESTDIR)$(ASTEXAMPLEDIR)/asterisk.conf -+ echo "astrundir => $(ASTVARRUNDIR)" >> $(DESTDIR)$(ASTEXAMPLEDIR)/asterisk.conf -+ echo "astlogdir => $(ASTLOGDIR)" >> $(DESTDIR)$(ASTEXAMPLEDIR)/asterisk.conf - for x in sounds/demo-*; do \ - if grep -q "^%`basename $$x`%" sounds.txt; then \ - install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \ +- if [ "$(OVERWRITE)" = "y" ] || [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \ ++ if [ "$(OVERWRITE)" = "y" ] || [ ! -f $(DESTDIR)$(ASTEXAMPLEDIR)/asterisk.conf ]; then \ + ( \ + echo "[directories]" ; \ + echo "astetcdir => $(ASTETCDIR)" ; \ +@@ -759,7 +765,7 @@ samples: adsi + echo ";astctlowner = root" ; \ + echo ";astctlgroup = apache" ; \ + echo ";astctl = asterisk.ctl" ; \ +- ) > $(DESTDIR)$(ASTCONFPATH) ; \ ++ ) > $(DESTDIR)$(ASTEXAMPLEDIR)/asterisk.conf ; \ + else \ + echo "Skipping asterisk.conf creation"; \ + fi diff --git a/comms/asterisk/patches/patch-ab b/comms/asterisk/patches/patch-ab index 5632b27258c..aaa277d36a3 100644 --- a/comms/asterisk/patches/patch-ab +++ b/comms/asterisk/patches/patch-ab @@ -1,17 +1,15 @@ -$NetBSD: patch-ab,v 1.1.1.1 2005/04/08 03:10:52 riz Exp $ ---- pbx/Makefile.orig 2003-10-26 10:50:49.000000000 -0800 -+++ pbx/Makefile 2005-03-30 14:08:41.000000000 -0800 -@@ -16,9 +16,12 @@ - PBX_LIBS=pbx_config.so pbx_wilcalu.so pbx_spool.so # pbx_gtkconsole.so pbx_kdeconsole.so - - # Add GTK console if appropriate --PBX_LIBS+=$(shell gtk-config --cflags >/dev/null 2>/dev/null && echo "pbx_gtkconsole.so") -+#PBX_LIBS+=$(shell gtk-config --cflags >/dev/null 2>/dev/null && echo "pbx_gtkconsole.so") +$NetBSD: patch-ab,v 1.2 2006/01/13 20:32:38 riz Exp $ + +--- pbx/Makefile.orig 2005-11-29 19:24:39.000000000 +0100 ++++ pbx/Makefile 2005-12-25 13:20:08.000000000 +0100 +@@ -23,6 +23,10 @@ # Add KDE Console if appropriate #PBX_LIBS+=$(shell [ "$$QTDIR" != "" ] && echo "pbx_kdeconsole.so") + +ifdef ASTERISK_USE_GTK +PBX_LIBS+=pbx_gtkconsole.so +endif - - - GTK_FLAGS=`gtk-config --cflags gthread` ++ + GTK_FLAGS=`${CROSS_COMPILE_BIN}gtk-config --cflags gthread` + GTK_LIBS=`${CROSS_COMPILE_BIN}gtk-config --libs gthread` + MOC=$(QTDIR)/bin/moc diff --git a/comms/asterisk/patches/patch-ac b/comms/asterisk/patches/patch-ac index f946d432c10..e397e21db2e 100644 --- a/comms/asterisk/patches/patch-ac +++ b/comms/asterisk/patches/patch-ac @@ -1,28 +1,27 @@ -$NetBSD: patch-ac,v 1.1.1.1 2005/04/08 03:10:52 riz Exp $ ---- res/Makefile.orig 2004-07-17 13:58:01.000000000 -0700 -+++ res/Makefile 2005-03-30 12:48:37.000000000 -0800 -@@ -13,15 +13,18 @@ +$NetBSD: patch-ac,v 1.2 2006/01/13 20:32:38 riz Exp $ + +--- res/Makefile.orig 2005-11-29 19:24:39.000000000 +0100 ++++ res/Makefile 2005-12-25 13:16:43.000000000 +0100 +@@ -13,14 +13,14 @@ - MODS=res_adsi.so res_features.so res_crypto.so res_musiconhold.so res_indications.so res_monitor.so \ - res_agi.so --MODS+=$(shell if [ -f "/usr/include/odbcinst.h" ]; then echo "res_odbc.so res_config_odbc.so"; fi) --MODS+=$(shell if [ -f "/usr/local/include/odbcinst.h" ]; then echo "res_odbc.so res_config_odbc.so"; fi) --MODS+=$(shell if [ -f "/usr/include/osp/osp.h" ]; then echo "res_osp.so"; fi) -+#MODS+=$(shell if [ -f "/usr/include/odbcinst.h" ]; then echo "res_odbc.so res_config_odbc.so"; fi) -+#MODS+=$(shell if [ -f "/usr/local/include/odbcinst.h" ]; then echo "res_odbc.so res_config_odbc.so"; fi) -+#MODS+=$(shell if [ -f "/usr/include/osp/osp.h" ]; then echo "res_osp.so"; fi) + MODS=res_indications.so res_monitor.so res_adsi.so res_agi.so res_features.so - CRYPTO_LIBS=-lssl -lcrypto +-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/odbcinst.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/odbcinst.h),) +- ifneq (${OSARCH},FreeBSD) +- MODS+=res_config_odbc.so +- else +- MODS+=$(shell if test ${BSDVERSION} -ge 500000 ; then echo "res_config_odbc.so"; fi) +- endif +- MODS+=res_odbc.so +-endif ++# ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/odbcinst.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/odbcinst.h),) ++# ifneq (${OSARCH},FreeBSD) ++# MODS+=res_config_odbc.so ++# else ++# MODS+=$(shell if test ${BSDVERSION} -ge 500000 ; then echo "res_config_odbc.so"; fi) ++# endif ++# MODS+=res_odbc.so ++# endif --CFLAGS+= --CFLAGS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo " -DZAPATA_MOH") --CFLAGS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo " -DZAPATA_MOH") -+#CFLAGS+= -+#CFLAGS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo " -DZAPATA_MOH") -+#CFLAGS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo " -DZAPATA_MOH") -+ifdef ASTERISK_USE_ZAPTEL -+CFLAGS+=-DZAPATA_MOH -+endif - # - # Work around buggy RedHat 9.0 - # + ifneq ($(NOCRYPTO),yes) + MODS+=res_crypto.so diff --git a/comms/asterisk/patches/patch-ad b/comms/asterisk/patches/patch-ad index dc6be8986fd..b66110e3fb7 100644 --- a/comms/asterisk/patches/patch-ad +++ b/comms/asterisk/patches/patch-ad @@ -1,88 +1,137 @@ -$NetBSD: patch-ad,v 1.1.1.1 2005/04/08 03:10:52 riz Exp $ ---- channels/Makefile.orig 2004-08-31 09:33:00.000000000 -0700 -+++ channels/Makefile 2005-03-30 12:32:50.000000000 -0800 -@@ -38,11 +38,11 @@ - #CHANNEL_LIBS+=chan_vofr +$NetBSD: patch-ad,v 1.2 2006/01/13 20:32:38 riz Exp $ + +--- channels/Makefile.orig 2005-11-29 19:24:39.000000000 +0100 ++++ channels/Makefile 2005-12-25 13:13:12.000000000 +0100 +@@ -22,12 +22,13 @@ + endif + + ifeq ($(findstring BSD,${OSARCH}),BSD) +- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib ++ CFLAGS+=-I${PREFIX}/include -L${PREFIX}/lib + endif ifeq (${OSARCH},OpenBSD) --MYSQLLIB=-L/usr/local/lib/mysql -lmysqlclient --CFLAGS+=-I/usr/local/include -+MYSQLLIB=-L${PREFIX}/lib/mysql -lmysqlclient -+CFLAGS+=-I${PREFIX}/include - PTLIB=-lpt_OpenBSD_x86_r - H323LIB=-lh323_OpenBSD_x86_r --CHANH323LIB=-L/usr/local/lib -+CHANH323LIB=-L${PREFIX}/lib + PTLIB=-lpt_OpenBSD_x86_r + H323LIB=-lh323_OpenBSD_x86_r ++ CHANH323LIB=-L${PREFIX}/lib endif + ifeq (${OSARCH},Linux) - MYSQLLIB=-L/usr/lib/mysql -lmysqlclient -@@ -60,33 +60,36 @@ - PTLIB=-lpt_FreeBSD_x86_r - H323LIB=-lh323_FreeBSD_x86_r - CHANH323LIB=-pthread --SOLINK+=-L/usr/local/lib -+SOLINK+=-L${PREFIX}/lib -R${PREFIX}/lib - endif - ifeq (${OSARCH},NetBSD) - PTLIB=-lpt_NetBSD_x86_r - H323LIB=-lh323_NetBSD_x86_r --SOLINK+=-L/usr/local/lib -+SOLINK+=-L${PREFIX}/lib -R${PREFIX}/lib - endif - ifneq (${OSARCH},Darwin) - CHANNEL_LIBS+=chan_oss.so +@@ -73,40 +74,40 @@ + SOLINK+=-lrt endif --CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/ixjuser.h ] && echo chan_phone.so) --CHANNEL_LIBS+=$(shell [ -f /usr/local/include/ixjuser.h ] && echo chan_phone.so) --CHANNEL_LIBS+=$(shell [ -f h323/libchanh323.a ] && echo chan_h323.so) -+#CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/ixjuser.h ] && echo chan_phone.so) -+CHANNEL_LIBS+=$(shell [ -f ${PREFIX}/include/ixjuser.h ] && echo chan_phone.so) -+#CHANNEL_LIBS+=$(shell [ -f h323/libchanh323.a ] && echo chan_h323.so) +-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/ixjuser.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/ixjuser.h),) +- CHANNEL_LIBS+=chan_phone.so +-endif +- +-ifneq ($(wildcard h323/libchanh323.a),) +- CHANNEL_LIBS+=chan_h323.so +-endif +- +-ifneq ($(wildcard misdn/chan_misdn_lib.a),) +- CHANNEL_LIBS+=chan_misdn.so +-endif ++# ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/ixjuser.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/ixjuser.h),) ++# CHANNEL_LIBS+=chan_phone.so ++# endif ++ ++# ifneq ($(wildcard h323/libchanh323.a),) ++# CHANNEL_LIBS+=chan_h323.so ++# endif ++ ++# ifneq ($(wildcard misdn/chan_misdn_lib.a),) ++# CHANNEL_LIBS+=chan_misdn.so ++# endif CFLAGS+=-Wno-missing-prototypes -Wno-missing-declarations --CFLAGS+=$(shell [ ! -f /usr/include/linux/if_wanpipe.h ] && echo " -DOLD_SANGOMA_API") --CHANNEL_LIBS+=$(shell [ -f /usr/include/alsa/asoundlib.h ] && echo "chan_alsa.so") --CFLAGS+=$(shell [ -f /usr/lib/libpri.so.1 ] && echo " -DZAPATA_PRI") --CFLAGS+=$(shell [ -f /usr/lib/libmfcr2.so.1 ] && echo " -DZAPATA_R2") --CFLAGS+=$(shell [ -f alsa-monitor.h ] && echo " -DALSA_MONITOR") --ZAPPRI=$(shell [ -f /usr/lib/libpri.so.1 ] && echo "-lpri") --ZAPR2=$(shell [ -f /usr/lib/libmfcr2.so.1 ] && echo "-lmfcr2") --CFLAGS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo "-DIAX_TRUNKING") --CFLAGS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo "-DIAX_TRUNKING") --CHANNEL_LIBS+=$(shell [ -f /usr/include/vpbapi.h ] && echo "chan_vpb.so" ) --CFLAGS+=$(shell [ -f /usr/include/vpbapi.h ] && echo " -DLINUX") -+#CFLAGS+=$(shell [ ! -f /usr/include/linux/if_wanpipe.h ] && echo " -DOLD_SANGOMA_API") -+#CHANNEL_LIBS+=$(shell [ -f /usr/include/alsa/asoundlib.h ] && echo "chan_alsa.so") -+#CFLAGS+=$(shell [ -f /usr/lib/libpri.so.1 ] && echo " -DZAPATA_PRI") -+#CFLAGS+=$(shell [ -f /usr/lib/libmfcr2.so.1 ] && echo " -DZAPATA_R2") -+#CFLAGS+=$(shell [ -f alsa-monitor.h ] && echo " -DALSA_MONITOR") -+#ZAPPRI=$(shell [ -f /usr/lib/libpri.so.1 ] && echo "-lpri") -+#ZAPR2=$(shell [ -f /usr/lib/libmfcr2.so.1 ] && echo "-lmfcr2") -+#CFLAGS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo "-DIAX_TRUNKING") -+#CFLAGS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo "-DIAX_TRUNKING") -+ifdef ASTERISK_USE_ZAPTEL -+CFLAGS+= -DIAX_TRUNKING -+endif -+#CHANNEL_LIBS+=$(shell [ -f /usr/include/vpbapi.h ] && echo "chan_vpb.so" ) -+#CFLAGS+=$(shell [ -f /usr/include/vpbapi.h ] && echo " -DLINUX") + +-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/alsa/asoundlib.h),) +- CHANNEL_LIBS+=chan_alsa.so +-endif +- +-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libpri.so.1)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libpri.so.1),) +- CFLAGS+=-DZAPATA_PRI +- ZAPPRI=-lpri +-endif +- +-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libmfcr2.so.1)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libmfcr2.so.1),) +- CFLAGS+=-DZAPATA_R2 +- ZAPR2=-lmfcr2 +-endif ++# ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/alsa/asoundlib.h),) ++# CHANNEL_LIBS+=chan_alsa.so ++# endif ++ ++# ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libpri.so.1)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libpri.so.1),) ++# CFLAGS+=-DZAPATA_PRI ++# ZAPPRI=-lpri ++# endif ++ ++# ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libmfcr2.so.1)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libmfcr2.so.1),) ++# CFLAGS+=-DZAPATA_R2 ++# ZAPR2=-lmfcr2 ++# endif ALSA_SRC=chan_alsa.c - ALSA_SRC+=$(shell [ -f alsa-monitor.h ] && echo "alsa-monitor.h") -@@ -106,10 +109,13 @@ - ZAPDIR=/usr/lib +-ifneq ($(wildcard alsa-monitor.h),) +- CFLAGS+=-DALSA_MONITOR +- ALSA_SRC+=alsa-monitor.h +-endif ++# ifneq ($(wildcard alsa-monitor.h),) ++# CFLAGS+=-DALSA_MONITOR ++# ALSA_SRC+=alsa-monitor.h ++# endif --CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo "chan_zap.so") --CHANNEL_LIBS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo "chan_zap.so") -+#CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo "chan_zap.so") -+#CHANNEL_LIBS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo "chan_zap.so") -+ifdef ASTERISK_USE_ZAPTEL -+CHANNEL_LIBS+=chan_zap.so -+endif + ifndef WITHOUT_ZAPTEL + ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),) +@@ -121,10 +122,10 @@ + endif + endif # WITHOUT_ZAPTEL --CHANNEL_LIBS+=$(shell [ -f /usr/include/nbs.h ] && echo "chan_nbs.so" ) -+#CHANNEL_LIBS+=$(shell [ -f /usr/include/nbs.h ] && echo "chan_nbs.so" ) +-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/vpbapi.h),) +- CHANNEL_LIBS+=chan_vpb.so +- CFLAGS+=-DLINUX +-endif ++# ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/vpbapi.h),) ++# CHANNEL_LIBS+=chan_vpb.so ++# CFLAGS+=-DLINUX ++# endif + + CFLAGS+=-DCRYPTO + +@@ -136,9 +137,9 @@ + + ZAPDIR=/usr/lib + +-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/nbs.h),) +- CHANNEL_LIBS+=chan_nbs.so +-endif ++# ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/nbs.h),) ++# CHANNEL_LIBS+=chan_nbs.so ++# endif ifndef OPENH323DIR - OPENH323DIR=$(HOME)/openh323 + OPENH323DIR=$(HOME)/openh323 +@@ -163,13 +164,13 @@ + include .depend + endif + +-ifneq ($(wildcard h323/Makefile.ast),) +- include h323/Makefile.ast +-endif +- +-ifneq ($(wildcard misdn/Makefile.ast),) +- include misdn/Makefile.ast +-endif ++# ifneq ($(wildcard h323/Makefile.ast),) ++# include h323/Makefile.ast ++# endif ++ ++# ifneq ($(wildcard misdn/Makefile.ast),) ++# include misdn/Makefile.ast ++# endif + + gentone: gentone.c + $(HOST_CC) -o gentone gentone.c -lm diff --git a/comms/asterisk/patches/patch-ae b/comms/asterisk/patches/patch-ae index cc3a3c9701c..2a218da43df 100644 --- a/comms/asterisk/patches/patch-ae +++ b/comms/asterisk/patches/patch-ae @@ -1,19 +1,36 @@ -$NetBSD: patch-ae,v 1.1.1.1 2005/04/08 03:10:52 riz Exp $ ---- apps/Makefile.orig 2005-03-30 12:40:19.000000000 -0800 -+++ apps/Makefile 2005-03-30 12:41:21.000000000 -0800 -@@ -39,9 +39,12 @@ - #APPS+=app_sql_odbc.so +$NetBSD: patch-ae,v 1.2 2006/01/13 20:32:38 riz Exp $ +--- apps/Makefile.orig 2005-11-29 18:24:39.000000000 +0000 ++++ apps/Makefile 2006-01-02 00:58:23.000000000 +0000 +@@ -45,15 +45,17 @@ #APPS+=app_rpt.so --APPS+=$(shell if [ -f /usr/include/linux/zaptel.h ]; then echo "app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so" ; fi) --APPS+=$(shell if [ -f /usr/local/include/zaptel.h ]; then echo "app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so" ; fi) --APPS+=$(shell if [ -f /usr/include/osp/osp.h ]; then echo "app_osplookup.so" ; fi) -+#APPS+=$(shell if [ -f /usr/include/linux/zaptel.h ]; then echo "app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so" ; fi) -+#APPS+=$(shell if [ -f /usr/local/include/zaptel.h ]; then echo "app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so" ; fi) -+#APPS+=$(shell if [ -f /usr/include/osp/osp.h ]; then echo "app_osplookup.so" ; fi) -+ifdef ASTERISK_USE_ZAPTEL -+APPS+= app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so -+endif + ifndef WITHOUT_ZAPTEL +-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h),) ++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)$(PREFIX)/include/zaptel.h),) + APPS+=app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so app_page.so + endif + endif # WITHOUT_ZAPTEL - CFLAGS+=-fPIC +-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/osp/osp.h $(CROSS_COMPILE_TARGET)/usr/include/osp/osp.h),) ++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)$(PREFIX)/include/osp/osp.h $(CROSS_COMPILE_TARGET)/usr/include/osp/osp.h),) + APPS+=app_osplookup.so + endif ++CFLAGS+=-I$(CROSS_COMPILE_TARGET)/$(PREFIX)/include -L$(CROSS_COMPILE_TARGET)/$(PREFIX)/lib ++ + ifeq ($(findstring BSD,${OSARCH}),BSD) + CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib + endif +@@ -103,10 +105,10 @@ + $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(CURLLIBS) + + app_sql_postgres.o: app_sql_postgres.c +- $(CC) -pipe -I/usr/local/pgsql/include $(CFLAGS) -c -o app_sql_postgres.o app_sql_postgres.c ++ $(CC) -pipe -I${PREFIX}/include $(CFLAGS) -c -o app_sql_postgres.o app_sql_postgres.c + + app_sql_postgres.so: app_sql_postgres.o +- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -L/usr/local/pgsql/lib -lpq ++ $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -L${PREFIX}/lib -lpq + + app_sql_odbc.so: app_sql_odbc.o + $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -lodbc diff --git a/comms/asterisk/patches/patch-af b/comms/asterisk/patches/patch-af index d3845613ffc..73339b11ae7 100644 --- a/comms/asterisk/patches/patch-af +++ b/comms/asterisk/patches/patch-af @@ -1,20 +1,37 @@ -$NetBSD: patch-af,v 1.2 2005/09/02 12:58:34 adam Exp $ +$NetBSD: patch-af,v 1.3 2006/01/13 20:32:38 riz Exp $ ---- codecs/gsm/Makefile.orig 2005-06-21 14:27:28.000000000 +0000 -+++ codecs/gsm/Makefile -@@ -44,6 +44,7 @@ ifneq ($(shell uname -m),ppc) - ifneq ($(shell uname -m),alpha) - ifneq ($(shell uname -m),armv4l) - ifneq (${PROC},sparc64) -+ifneq (${PROC},powerpc) - ifneq (${PROC},ppc) - ifneq (${PROC},ppc64) - OPTIMIZE+=-march=$(PROC) -@@ -56,6 +57,7 @@ endif - endif - endif - endif -+endif +--- codecs/gsm/Makefile.orig 2005-11-29 19:24:39.000000000 +0100 ++++ codecs/gsm/Makefile 2005-12-25 12:55:32.000000000 +0100 +@@ -37,32 +37,6 @@ WAV49 = -DWAV49 + ######### ppro's, etc, as well as the AMD K6 and K7. The compile will + ######### probably require gcc. +-ifneq (${OSARCH},Darwin) +-ifneq (${OSARCH},SunOS) +-ifneq (${PROC},x86_64) +-ifneq (${PROC},ultrasparc) +-ifneq ($(shell uname -m),ppc) +-ifneq ($(shell uname -m),ppc64) +-ifneq ($(shell uname -m),alpha) +-ifneq ($(shell uname -m),armv4l) +-ifneq (${PROC},sparc64) +-ifneq (${PROC},arm) +-ifneq (${PROC},ppc) +-ifneq (${PROC},ppc64) +-OPTIMIZE+=-march=$(PROC) +-endif +-endif +-endif +-endif +-endif +-endif +-endif +-endif +-endif +-endif +-endif +-endif +- #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only. #This works for even old (2.96) versions of gcc and provides a small boost either way. + #A ultrasparc cpu is really v9 but the stock debian stable 3.0 gcc doesn't support it. diff --git a/comms/asterisk/patches/patch-ah b/comms/asterisk/patches/patch-ah deleted file mode 100644 index 350ed2f2dd4..00000000000 --- a/comms/asterisk/patches/patch-ah +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ah,v 1.1 2006/01/02 16:02:10 joerg Exp $ - ---- md5.c.orig 2006-01-02 15:26:06.000000000 +0000 -+++ md5.c -@@ -3,7 +3,7 @@ - #if defined( __OpenBSD__ ) - # include <machine/types.h> - # include <sys/endian.h> --#elif defined( __FreeBSD__ ) || defined( __NetBSD__ ) -+#elif defined( __FreeBSD__ ) || defined( __NetBSD__ ) || defined(__DragonFly__) - # include <sys/types.h> - # include <sys/endian.h> - #elif defined( BSD ) && ( BSD >= 199103 ) || defined(__APPLE__) diff --git a/comms/asterisk/patches/patch-ai b/comms/asterisk/patches/patch-ai index 06fabde00d1..215788b01d5 100644 --- a/comms/asterisk/patches/patch-ai +++ b/comms/asterisk/patches/patch-ai @@ -1,13 +1,16 @@ -$NetBSD: patch-ai,v 1.1 2006/01/02 16:02:10 joerg Exp $ +$NetBSD: patch-ai,v 1.2 2006/01/13 20:32:38 riz Exp $ ---- aesopt.h.orig 2006-01-02 15:28:16.000000000 +0000 -+++ aesopt.h -@@ -151,7 +151,7 @@ - #if defined( __OpenBSD__ ) - # include <machine/types.h> - # include <sys/endian.h> --#elif defined( __FreeBSD__ ) || defined( __NetBSD__ ) -+#elif defined( __FreeBSD__ ) || defined( __NetBSD__ ) || defined(__DragonFly__) - # include <sys/types.h> - # include <sys/endian.h> - #elif defined( BSD ) && ( BSD >= 199103 ) || defined(__APPLE__) +--- include/asterisk/endian.h.orig 2006-01-13 00:17:16.000000000 +0000 ++++ include/asterisk/endian.h +@@ -32,6 +32,11 @@ + #ifndef __BYTE_ORDER + #ifdef __linux__ + #include <endian.h> ++#elif defined(__DragonFly__) ++#include <sys/endian.h> ++#define __BYTE_ORDER BYTE_ORDER ++#define __LITTLE_ENDIAN LITTLE_ENDIAN ++#define __BIG_ENDIAN BIG_ENDIAN + #elif defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__) + #if defined(__OpenBSD__) + #include <machine/types.h> diff --git a/comms/asterisk/patches/patch-aj b/comms/asterisk/patches/patch-aj index ba3498b9087..57d6aae7ef0 100644 --- a/comms/asterisk/patches/patch-aj +++ b/comms/asterisk/patches/patch-aj @@ -1,13 +1,13 @@ -$NetBSD: patch-aj,v 1.1 2006/01/02 16:02:10 joerg Exp $ +$NetBSD: patch-aj,v 1.2 2006/01/13 20:32:38 riz Exp $ ---- utils.c.orig 2006-01-02 15:32:32.000000000 +0000 +--- utils.c.orig 2006-01-13 00:23:00.000000000 +0000 +++ utils.c -@@ -28,7 +28,7 @@ +@@ -58,7 +58,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi static char base64[64]; static char b2a[256]; --#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined( __NetBSD__ ) || defined(__APPLE__) -+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined( __NetBSD__ ) || defined(__APPLE__) || defined(__DragonFly__) +-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined( __NetBSD__ ) || defined(__APPLE__) || defined(__CYGWIN__) ++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined( __NetBSD__ ) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__DragonFly__) /* duh? ERANGE value copied from web... */ #define ERANGE 34 diff --git a/comms/asterisk/patches/patch-ak b/comms/asterisk/patches/patch-ak index 650ca078c5e..19713edfe4e 100644 --- a/comms/asterisk/patches/patch-ak +++ b/comms/asterisk/patches/patch-ak @@ -1,17 +1,8 @@ -$NetBSD: patch-ak,v 1.1 2006/01/02 16:02:10 joerg Exp $ +$NetBSD: patch-ak,v 1.2 2006/01/13 20:32:38 riz Exp $ ---- channels/chan_oss.c.orig 2006-01-02 15:34:15.000000000 +0000 +--- channels/chan_oss.c.orig 2006-01-13 00:31:44.000000000 +0000 +++ channels/chan_oss.c -@@ -37,7 +37,7 @@ - - #if defined( __OpenBSD__ ) - # include <sys/endian.h> --#elif defined( __FreeBSD__ ) || defined( __NetBSD__ ) -+#elif defined( __FreeBSD__ ) || defined( __NetBSD__ ) || defined(__DragonFly__) - # include <sys/endian.h> - #elif defined( BSD ) && ( BSD >= 199103 ) || defined(__APPLE__) - # include <machine/endian.h> -@@ -54,7 +54,7 @@ +@@ -42,7 +42,7 @@ #ifdef __linux #include <linux/soundcard.h> diff --git a/comms/asterisk/patches/patch-al b/comms/asterisk/patches/patch-al index d3d11a4d341..213efa77908 100644 --- a/comms/asterisk/patches/patch-al +++ b/comms/asterisk/patches/patch-al @@ -1,13 +1,22 @@ -$NetBSD: patch-al,v 1.1 2006/01/02 16:02:10 joerg Exp $ +$NetBSD: patch-al,v 1.2 2006/01/13 20:32:38 riz Exp $ ---- apps/app_sms.c.orig 2006-01-02 15:36:41.000000000 +0000 -+++ apps/app_sms.c -@@ -208,7 +208,7 @@ static void - packdate (unsigned char *o, time_t w) - { - struct tm *t = localtime (&w); --#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined( __NetBSD__ ) || defined(__APPLE__) -+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined( __NetBSD__ ) || defined(__APPLE__) || defined(__DragonFly__) - int z = - t->tm_gmtoff / 3600 / 15; - #else - int z = timezone / 3600 / 15; +--- pbx/pbx_dundi.c.orig 2006-01-13 00:45:18.000000000 +0000 ++++ pbx/pbx_dundi.c +@@ -30,7 +30,7 @@ + #include <sys/socket.h> + #include <string.h> + #include <errno.h> +-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(SOLARIS) || defined(__Darwin__) ++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(SOLARIS) || defined(__Darwin__) || defined(__DragonFly__) + #include <sys/types.h> + #include <netinet/in_systm.h> + #endif +@@ -38,7 +38,7 @@ + #include <sys/ioctl.h> + #include <netinet/in.h> + #include <net/if.h> +-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__Darwin__) ++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__Darwin__) || defined(__DragonFly__) + #include <net/if_dl.h> + #include <ifaddrs.h> + #endif diff --git a/comms/asterisk/patches/patch-am b/comms/asterisk/patches/patch-am index e63f4a4cbb6..84ad07dab5f 100644 --- a/comms/asterisk/patches/patch-am +++ b/comms/asterisk/patches/patch-am @@ -1,13 +1,13 @@ -$NetBSD: patch-am,v 1.1 2006/01/02 16:02:10 joerg Exp $ +$NetBSD: patch-am,v 1.2 2006/01/13 20:32:38 riz Exp $ ---- apps/app_intercom.c.orig 2006-01-02 15:39:06.000000000 +0000 -+++ apps/app_intercom.c -@@ -29,7 +29,7 @@ - - #if defined(__linux__) - #include <linux/soundcard.h> --#elif defined(__FreeBSD__) -+#elif defined(__FreeBSD__) || defined(__DragonFly__) - #include <sys/soundcard.h> +--- apps/app_sms.c.orig 2006-01-13 00:50:10.000000000 +0000 ++++ apps/app_sms.c +@@ -439,7 +439,7 @@ static int packsms (unsigned char dcs, u + static void packdate (unsigned char *o, time_t w) + { + struct tm *t = localtime (&w); +-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined( __NetBSD__ ) || defined(__APPLE__) ++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined( __NetBSD__ ) || defined(__APPLE__) || defined(__DragonFly__) + int z = -t->tm_gmtoff / 60 / 15; #else - #include <soundcard.h> + int z = timezone / 60 / 15; diff --git a/comms/asterisk/patches/patch-an b/comms/asterisk/patches/patch-an new file mode 100644 index 00000000000..6a566539641 --- /dev/null +++ b/comms/asterisk/patches/patch-an @@ -0,0 +1,13 @@ +$NetBSD: patch-an,v 1.1 2006/01/13 20:32:38 riz Exp $ + +--- utils/streamplayer.c.orig 2006-01-13 01:14:29.000000000 +0000 ++++ utils/streamplayer.c +@@ -31,7 +31,7 @@ + #include <unistd.h> + #include <sys/types.h> + #include <sys/socket.h> +-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__Darwin__) || defined(__CYGWIN__) ++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__Darwin__) || defined(__CYGWIN__) || defined(__DragonFly__) + #include <netinet/in.h> + #endif + #include <sys/time.h> |