From owner-svn-ports-all@FreeBSD.ORG Thu Aug 16 21:20:29 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 94A141065673; Thu, 16 Aug 2012 21:20:29 +0000 (UTC) (envelope-from jgh@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7ED5E8FC15; Thu, 16 Aug 2012 21:20:29 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7GLKT3F070816; Thu, 16 Aug 2012 21:20:29 GMT (envelope-from jgh@svn.freebsd.org) Received: (from jgh@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7GLKTDV070808; Thu, 16 Aug 2012 21:20:29 GMT (envelope-from jgh@svn.freebsd.org) Message-Id: <201208162120.q7GLKTDV070808@svn.freebsd.org> From: Jason Helfman Date: Thu, 16 Aug 2012 21:20:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r302659 - in head/net/freeswitch-core-devel: . files X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Aug 2012 21:20:29 -0000 Author: jgh Date: Thu Aug 16 21:20:28 2012 New Revision: 302659 URL: http://svn.freebsd.org/changeset/ports/302659 Log: - update to 1.2.1 - adopt optionsNG PR: 170318 Submitted by: maintainer, r.neese@gmail.com Added: head/net/freeswitch-core-devel/files/patch-libs-js-nsprpub-pr-include-md-_freebsd.cfg (contents, props changed) head/net/freeswitch-core-devel/files/patch-libs-js-nsprpub-pr-include-md-_freebsd.h (contents, props changed) Deleted: head/net/freeswitch-core-devel/files/patch-src-mod-event_handlers-mod_event_socket-mod_event_socket.c Modified: head/net/freeswitch-core-devel/Makefile head/net/freeswitch-core-devel/distinfo (contents, props changed) head/net/freeswitch-core-devel/files/patch-build-getlib.sh.in (contents, props changed) head/net/freeswitch-core-devel/files/patch-conf-vanilla-sip_profiles-internal.xml (contents, props changed) head/net/freeswitch-core-devel/pkg-plist (contents, props changed) Modified: head/net/freeswitch-core-devel/Makefile ============================================================================== --- head/net/freeswitch-core-devel/Makefile Thu Aug 16 20:39:11 2012 (r302658) +++ head/net/freeswitch-core-devel/Makefile Thu Aug 16 21:20:28 2012 (r302659) @@ -6,8 +6,7 @@ # PORTNAME= freeswitch -DISTVERSION= 1.2.rc2 -PORTREVISION= 2 +DISTVERSION= 1.2.1 CATEGORIES= net MASTER_SITES= http://files.freeswitch.org/ \ http://files.freeswitch.org/downloads/libs/:2 \ @@ -55,7 +54,7 @@ USE_RC_SUBR= freeswitch HAS_CONFIGURE= yes USE_LDCONFIG= yes LDFLAGS+= -L${LOCALBASE}/lib -INCLUDES= -I${LOCALBASE}/include +INCLUDES+= -I${LOCALBASE}/include CONFIGURE_ARGS+=--prefix=${PREFIX} \ --bindir=${PREFIX}/bin \ --datadir=${VARBASE}/db/${PORTNAME} \ @@ -78,6 +77,7 @@ CONFIGURE_ARGS+=--prefix=${PREFIX} \ CONFIGURE_ENV+= INCLUDES="${INCLUDES}" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" +CPPFLAGS+= -I${LOCALBASE}/include FREESWITCH_USER?= freeswitch FREESWITCH_GROUP?= ${FREESWITCH_USER} @@ -96,76 +96,97 @@ WWWDIR= ${PREFIX}/www/${PORTNAME} SAMPLESDIR= conf conf/autoload_configs -OPTIONS= REBOOTSTRAP "Rebootstrap freeswitch build" on \ - MODABSTRACTION "Simplify/Standarize API" on \ - MODAVMD "Detects voicemail generalized approach" on \ - MODCALLCENTER "Call queuing application" on \ - MODCIDLOOKUP "Lookup CID via database, url" on\ - MODBLACKLIST "Blacklisk phone numbers" on \ - MODCURL "Allows scripts to make HTTP requests" off \ - MODDISTRIBUTOR "Simple round-robin style distributions" on \ - MODEASYROUTE "DID Database lookup" off \ - MODFSK "FSK (Frequency-Shift Keying) data transfer" on \ - MODHTTAPI "HTTP API" on \ - MODHTTPCACHE "HTTP GET with caching" off \ - MODDIRECTORY "Dial by name directory" on \ - MODLADSPA "use Auto-tune on your call" off \ - MODLCR "Least Cost Routing" off \ - MODMEMCACHE "Memcached API" off \ - MODNIBBLEBILL "Billing Module" off \ - MODRSS "RSS feed text to speech" on \ - MODSNOM "Controlling softkeys on Snom phones" on \ - MODSPY "Extension/Call Spy tool" on \ - MODSOUNDTOUCH "Pitch shifting audio effects" on \ - MODSTRESS "Detect Stress in voice" off \ - MODSNAPSHOT "Audio/Disk Snapshot Tool" off \ - MODVMD "Voicemail Beep Detection" on \ - MODVOICEMAILIVR "IVR Based Voicemail(NEW)" on \ - MODAMRWB "GSM-AMRWB (ARM Wide Band) codec" on \ - MODCELT "Celt ultra-low delay audio codec" on \ - MODCODEC2 "Freeswitch Codec2 Module" on \ - MODISAC "Isac Codec (New Codec)" on \ - MODOPUS "OPUS ultra-low delay audio codec" on \ - MODSILK "Skype Silk Codec (Broken/BUILD ISSUES)" off \ - MODDPASTERISK "Asterisk Dialplan (Old School Dialplan)" off \ - MODDPDIRECTORY "obtain dialplan from a directory resource" off \ - MODDINGALING "Jabber/Google Talk integration module" on \ - MODFREETDM "Interface to Zaptel hardware End Points" off \ - MODPORTAUDIO "Portaudio API" on \ - MODRTMP "Real time media protocol" on \ - MODSKINNY "Skinny/SCCP" on \ - MODFLITE "Free open source Text to Speech" on \ - MODPOCKETSPHINX "Free open source Speech Recognition" on \ - MODTTSCMDLINE "Play Sounds via commandline" on \ - MODUNIMRCP "Open MRCP implementation ASR/Text" off \ - MODCDRPGCSV "Asterisk Compatible CDR PostgreSQL" off \ - MODERLANGEVENT "send/receive events/commands in Erlang" off \ - MODMULTICAST "Broadcasts events to netmask" on \ - MODEVENTZMQ "Zeroconf config socket" off \ - MODSNMP "SNMP AgentX module" off \ - MODVLC "Play local mp3 files any rate(NEW Testing)" off \ - MODPASTREAM "PortAudio Streaming Module" on \ - MODSHELLSTREAM "Stream audio via shell command" on \ - MODSHOUT "Play local mp3 files any rate(Build Error)" off \ - MODMANAGED "Common Language Infrastructure API" off \ - MODPERL "Perl Lang Support" on \ - MODPYTHON "Python Lang Suppot" on \ - MODPOSIXTIMER "Posix timer (New/Testing)" on \ - MODXMLCURL "XML dynamically control of FreeSWITCH" on \ - MODXMLODBC "XML ODBC Module" on \ - MODXMLRPC "XML Remote Procedure Calls" on \ - MODSAYDE "German Voice Prompts" off \ - MODSAYES "Spanish Voice Prompts" off \ - MODSAYEN "English Voice Prompts" on \ - MODSAYFR "French Voice Prompts" off \ - MODSAYHE "Hebrew Voice Prompts" off \ - MODSAYHU "Hungarian Voice Propmts" off \ - MODSAYIT "Italian Voice Propmts" off \ - MODSAYNL "Dutch Voice Propmts" off \ - MODSAYPT "Portuguese Voice Propmts" off \ - MODSAYRU "Russian Voice Propmts" off \ - MODSAYTH "Thai Voice Propmts" off \ - MODSAYZH "Chinese Voice Propmts" off +OPTIONS_DEFINE= REBOOTSTRAP MODABSTRACTION MODAVMD MODCALLCENTER MODCIDLOOKUP MODBLACKLIST MODCURL \ + MODDISTRIBUTOR MODEASYROUTE MODFSK MODHTTAPI MODHTTPCACHE MODDIRECTORY MODLADSPA \ + MODLCR MODMEMCACHE MODNIBBLEBILL MODRSS MODSNOM MODSPY MODSOUNDTOUCH MODSTRESS MODSNAPSHOT \ + MODVMD MODVOICEMAILIVR MODAMRWB MODCELT MODCODEC2 MODILBC MODISAC MODOPUS MODSILK MODSIREN MODDPASTERISK \ + MODDPDIRECTORY MODDINGALING MODFREETDM MODPORTAUDIO MODRTMP MODSKINNY MODFLITE MODPOCKETSPHINX \ + MODTTSCMDLINE MODUNIMRCP MODCDRPGCSV MODERLANGEVENT MODMULTICAST MODEVENTZMQ MODSNMP MODVLC \ + MODPASTREAM MODSHELLSTREAM MODSHOUT MODMANAGED MODPERL MODPYTHON MODPOSIXTIMER MODXMLCURL \ + MODXMLODBC MODXMLRPC MODSAYDE MODSAYES MODSAYEN MODSAYFR MODSAYHE MODSAYHU MODSAYIT MODSAYNL \ + MODSAYPT MODSAYRU MODSAYTH MODSAYZH + +REBOOTSTRAP_DESC= Rebootstrap freeswitch build +MODABSTRACTION_DESC= Simplify/Standarize API +MODAVMD_DESC= Detects voicemail generalized approach +MODCALLCENTER_DESC= Call queuing application +MODCIDLOOKUP_DESC= Lookup CID via database, url +MODBLACKLIST_DESC= Blacklisk phone numbers +MODCURL_DESC= Allows scripts to make HTTP requests +MODDISTRIBUTOR_DESC= Simple round-robin style distributions +MODEASYROUTE_DESC= DID Database lookup +MODFSK_DESC= FSK (Frequency-Shift Keying) data transfer +MODHTTAPI_DESC= HTTP API +MODHTTPCACHE_DESC= HTTP GET with caching +MODDIRECTORY_DESC= Dial by name directory +MODLADSPA_DESC= use Auto-tune on your call +MODLCR_DESC= Least Cost Routing +MODMEMCACHE_DESC= Memcached API +MODNIBBLEBILL_DESC= Billing Module +MODRSS_DESC= RSS feed text to speech +MODSNOM_DESC= Controlling softkeys on Snom phones +MODSPY_DESC= Extension/Call Spy tool +MODSOUNDTOUCH_DESC= Pitch shifting audio effects +MODSTRESS_DESC= Detect Stress in voice +MODSNAPSHOT_DESC= Audio/Disk Snapshot Tool +MODVMD_DESC= Voicemail Beep Detection +MODVOICEMAILIVR_DESC= IVR Based Voicemail(NEW) +MODAMRWB_DESC= GSM-AMRWB (ARM Wide Band) codec +MODCELT_DESC= Celt ultra-low delay audio codec +MODCODEC2_DESC= Freeswitch Codec2 Module +MODILBC_DESC= ILBX Codec +MODISAC_DESC= Isac Codec (New Codec) +MODOPUS_DESC= OPUS ultra-low delay audio codec +MODSILK_DESC= Skype Silk Codec (Broken/BUILD ISSUES) +MODSIREN_DESC= Siren Codec +MODDPASTERISK_DESC= Asterisk Dialplan (Old School Dialplan) +MODDPDIRECTORY_DESC= obtain dialplan from a directory resource +MODDINGALING_DESC= Jabber/Google Talk integration module +MODFREETDM_DESC= Interface to Zaptel hardware End Points +MODPORTAUDIO_DESC= Portaudio API +MODRTMP_DESC= Real time media protocol +MODSKINNY_DESC= Skinny/SCCP +MODFLITE_DESC= Free open source Text to Speech +MODPOCKETSPHINX_DESC= Free open source Speech Recognition +MODTTSCMDLINE_DESC= Play Sounds via commandline +MODUNIMRCP_DESC= Open MRCP implementation ASR/Text +MODCDRPGCSV_DESC= Asterisk Compatible CDR PostgreSQL +MODERLANGEVENT_DESC= send/receive events/commands in Erlang +MODMULTICAST_DESC= Broadcasts events to netmask +MODEVENTZMQ_DESC= Zeroconf config socket +MODSNMP_DESC= SNMP AgentX module +MODVLC_DESC= Play local mp3 files any rate(NEW Testing) +MODPASTREAM_DESC= PortAudio Streaming Module +MODSHELLSTREAM_DESC= Stream audio via shell command +MODSHOUT_DESC= Play local mp3/shoutcast (Build Error) +MODMANAGED_DESC= Common Language Infrastructure API +MODPERL_DESC= Perl Lang Support +MODPYTHON_DESC= Python Lang Suppot +MODPOSIXTIMER_DESC= Posix timer (New/Testing) +MODXMLCURL_DESC= XML dynamically control of FreeSWITCH +MODXMLODBC_DESC= XML ODBC Module +MODXMLRPC_DESC= XML Remote Procedure Calls +MODSAYDE_DESC= German Voice Prompts +MODSAYES_DESC= Spanish Voice Prompts +MODSAYEN_DESC= English Voice Prompts +MODSAYFR_DESC= French Voice Prompts +MODSAYHE_DESC= Hebrew Voice Prompts +MODSAYHU_DESC= Hungarian Voice Propmts +MODSAYIT_DESC= Italian Voice Propmts +MODSAYNL_DESC= Dutch Voice Propmts +MODSAYPT_DESC= Portuguese Voice Propmts +MODSAYRU_DESC= Russian Voice Propmts +MODSAYTH_DESC= Thai Voice Propmts +MODSAYZH_DESC= Chinese Voice Propmts" + +OPTIONS_DEFAULT= REBOOTSTRAP MODABSTRACTION MODAVMD MODCALLCENTER MODCIDLOOKUP MODBLACKLIST MODCURL \ + MODDISTRIBUTOR MODEASYROUTE MODFSK MODHTTAPI MODHTTPCACHE MODDIRECTORY MODLADSPA MODLCR MODMEMCACHE \ + MODNIBBLEBILL MODRSS MODSNOM MODSPY MODVMD MODVOICEMAILIVR MODAMRWB MODCELT MODCODEC2 MODISAC MODILBC MODOPUS \ + MODSIREN MODDPDIRECTORY MODDINGALING MODPORTAUDIO MODRTMP MODSKINNY MODFLITE MODPOCKETSPHINX MODTTSCMDLINE MODUNIMRCP \ + MODMULTICAST MODEVENTZMQ MODPASTREAM MODSHELLSTREAM MODPERL MODPYTHON MODPOSIXTIMER MODXMLCURL MODXMLODBC \ + MODXMLRPC MODSAYEN + +NO_OPTIONS_SORT= yes .include @@ -173,15 +194,15 @@ OPTIONS= REBOOTSTRAP "Rebootstrap f CFLAGS+= -fPIC .endif -.for i in ${OPTIONS:Non:Noff:N"*"} -.if defined(WITH_${i}) -PLIST_SUB+= ${i}="" +.for opt in ${ALL_OPTIONS} +.if $(PORT_OPTIONS:M${opt}) +PLIST_SUB+= ${opt}="" .else -PLIST_SUB+= ${i}="@comment " +PLIST_SUB+= ${opt}="@comment " .endif .endfor -.if defined(WITH_MODFREETDM) +.if ${PORT_OPTIONS:MMODFREETDM} .if ${OSVERSION} < 703000 || (${OSVERSION} >= 800000 && ${OSVERSION} < 800108) IGNORE= sorry you can not use mod_freetdm on this version of freebsd ( dahdi support broken ) please update .else @@ -192,33 +213,33 @@ RUN_DEPENDS+= ${LOCALBASE}/include/dahdi .endif .endif -.if defined(WITH_MODSHOUT) +.if ${PORT_OPTIONS:MMODSHOUT} LIB_DEPENDS+= vorbis:${PORTSDIR}/audio/libvorbis .endif -.if defined(WITH_MODPERL) +.if ${PORT_OPTIONS:MMODPERL} LIB_DEPENDS+= gdbm:${PORTSDIR}/databases/gdbm \ db:${PORTSDIR}/databases/db42 .endif -.if defined(WITH_MODERLANGEVENT) +.if ${PORT_OPTIONS:MMODERLANGEVENT} BUILD_DEPENDS+= ${LOCALBASE}/lib/erlang/usr/include/erl_driver.h:${PORTSDIR}/lang/erlang .endif -.if defined(WITH_MODPYTHON) +.if ${PORT_OPTIONS:MMODPYTHON} USE_PYTHON= yes .endif -.if defined(WITH_MODCDRPGCSV) +.if ${PORT_OPTIONS:MMODCDRPGCSV} USE_PGSQL= yes .endif -.if defined(WITH_MODSNMP) +.if ${PORT_OPTIONS:MMODSNMP} BUILD_DEPENDS+= ${LOCALBASE}/include/net-snmp/definitions.h:${PORTSDIR}/net-mgmt/net-snmp RUN_DEPENDS+= ${LOCALBASE}/include/net-snmp/definitions.h:${PORTSDIR}/net-mgmt/net-snmp .endif -.if defined(WITH_MODLADSPA) +.if ${PORT_OPTIONS:MMODLADSPA} BUILD_DEPENDS+= ${LOCALBASE}/lib/ladspa/amp.so:${PORTSDIR}/audio/ladspa \ ${LOCALBASE}/lib/ladspa/tap_autopan.so:${PORTSDIR}/audio/tap-plugins \ ${LOCALBASE}/lib/ladspa/cmt.so:${PORTSDIR}/audio/cmt \ @@ -231,7 +252,7 @@ RUN_DEPENDS+= ${LOCALBASE}/lib/ladspa/am ${LOCALBASE}/lib/ladspa/autotalent.so:${PORTSDIR}/audio/autotalent .endif -.if defined(WITH_MODVLC) +.if ${PORT_OPTIONS:MMODVLC} LIB_DEPENDS+= vlc:/${PORTSDIR}/multimedia/vlc RUN_DEPENDS+= vlc:/${PORTSDIR}/multimedia/vlc .endif @@ -246,87 +267,88 @@ BROKEN= Requires lrintl, which is not pr pre-configure: @${REINPLACE_CMD} -e 's|base=http://files.freeswitch.org/downloads/libs/|base=file://${DISTDIR}/${DIST_SUBDIR}/|g' ${WRKSRC}/build/getlib.sh.in @${REINPLACE_CMD} -e 's|2.1.9|2.1.11|g' ${WRKSRC}/src/mod/event_handlers/mod_event_zmq/Makefile + @${REINPLACE_CMD} -e 's|ZMQ_BASEURL=http://download.zeromq.org|ZMQ_BASEURL=file://${DISTDIR}/${DIST_SUBDIR}/|g' ${WRKSRC}/src/mod/event_handlers/mod_event_zmq/Makefile @${REINPLACE_CMD} -e 's|\$$(MAKE) samples-conf|##\$$(MAKE) samples-conf|g' ${WRKSRC}/Makefile.am -.if defined(WITH_REBOOTSTRAP) +.if ${PORT_OPTIONS:MREBOOTSTRAP} cd ${WRKSRC} && ./rebootstrap.sh .endif post-configure: .for i in mod_unimrcp mod_flite mod_pocketsphinx -.if defined(WITH_${i:S/_//g:U}) +.if ${PORT_OPTIONS:M${i:S/_//g:U}} @${REINPLACE_CMD} -e 's|#\(asr_tts/${i}\)|\1|g' ${WRKSRC}/modules.conf .endif .endfor -.if defined(WITH_MODTTSCMDLINE) +.if ${PORT_OPTIONS:MMODTTSCMDLINE}} @${REINPLACE_CMD} -e 's|#asr_tts/mod_tts_commandline|asr_tts/mod_tts_commandline|g' ${WRKSRC}/modules.conf .endif .for i in mod_cidlookup mod_easyroute mod_lcr mod_soundtouch mod_rss mod_snom \ mod_vmd mod_avmd mod_spy mod_curl mod_nibblebill mod_memcache mod_directory mod_distributor \ mod_snapshot mod_callcenter mod_fsk mod_ladspa mod_blacklist mod_http_cache mod_abstraction \ mod_voicemail_ivr mod_httapi -.if defined(WITH_${i:S/_//g:U}) +.if ${PORT_OPTIONS:M${i:S/_//g:U}} @${REINPLACE_CMD} -e 's|#\(applications/${i}\)|\1|g' ${WRKSRC}/modules.conf .endif .endfor -.for i in mod_amrwb mod_celt mod_silk mod_codec2 mod_opus mod_isac -.if defined(WITH_${i:S/_//g:U}) +.for i in mod_amrwb mod_celt mod_silk mod_codec2 mod_opus mod_isac mod_ilbc mod_siren +.if ${PORT_OPTIONS:M${i:S/_//g:U}} @${REINPLACE_CMD} -e 's|#\(codecs/${i}\)|\1|g' ${WRKSRC}/modules.conf .endif .endfor .for i in mod_shell_stream mod_shout mod_vlc -.if defined(WITH_${i:S/_//g:U}) +.if ${PORT_OPTIONS:M${i:S/_//g:U}} @${REINPLACE_CMD} -e 's|#\(formats/${i}\)|\1|g' ${WRKSRC}/modules.conf .endif .endfor -.if defined(WITH_MODPASTREAM) +.if ${PORT_OPTIONS:MMODPASTREAM}} @${REINPLACE_CMD} -e 's|#formats/mod_portaudio_stream|formats/mod_portaudio_stream|g' ${WRKSRC}/modules.conf .endif .for i in mod_say_de mod_say_es mod_say_en mod_say_fr mod_say_he mod_say_hu mod_say_it mod_say_nl mod_say_pt mod_say_ru mod_say_th mod_say_zh -.if defined(WITH_${i:S/_//g:U}) +.if ${PORT_OPTIONS:M${i:S/_//g:U}} @${REINPLACE_CMD} -e 's|#\(say/${i}\)|\1|g' ${WRKSRC}/modules.conf .endif .endfor .for i in mod_perl mod_python -.if defined(WITH_${i:S/_//g:U}) +.if ${PORT_OPTIONS:M${i:S/_//g:U}} @${REINPLACE_CMD} -e 's|#\(languages/${i}\)|\1|g' ${WRKSRC}/modules.conf .endif .endfor .for i in mod_skinny mod_portaudio mod_dingaling mod_rtmp mod_khomp -.if defined(WITH_${i:S/_//g:U}) +.if ${PORT_OPTIONS:M${i:S/_//g:U}} @${REINPLACE_CMD} -e 's|#\(endpoints/${i}\)|\1|g' ${WRKSRC}/modules.conf .endif .endfor -.if defined(WITH_MODDPDIRECTORY) +.if ${PORT_OPTIONS:MMODDPDIRECTORY} @${REINPLACE_CMD} -e 's|#dialplans/mod_dialplan_directory|dialplans/mod_dialplan_directory|g' ${WRKSRC}/modules.conf .endif -.if defined(WITH_MODFREETDM) +.if ${PORT_OPTIONS:MMODFREETDM} @${REINPLACE_CMD} -e 's|#../../libs/freetdm/mod_freetdm|../../libs/freetdm/mod_freetdm|g' ${WRKSRC}/modules.conf .endif -.if defined(WITH_MODMULTICAST) +.if ${PORT_OPTIONS:MMODMULTICAST} @${REINPLACE_CMD} -e 's|#event_handlers/mod_event_multicast|event_handlers/mod_event_multicast|g' ${WRKSRC}/modules.conf .endif -.if defined(WITH_MODERLANGEVENT) +.if ${PORT_OPTIONS:MMODERLANGEVENT} @${REINPLACE_CMD} -e 's|#event_handlers/mod_erlang_event|event_handlers/mod_erlang_event|g' ${WRKSRC}/modules.conf .endif -.if defined(WITH_MODCDRPGCSV) +.if ${PORT_OPTIONS:MMODCDRPGCSV} @${REINPLACE_CMD} -e 's|#event_handlers/mod_cdr_pg_csv|event_handlers/mod_cdr_pg_csv|g' ${WRKSRC}/modules.conf .endif -.if defined(WITH_MODSNMP) +.if ${PORT_OPTIONS:MMODSNMP} @${REINPLACE_CMD} -e 's|#event_handlers/mod_snmp|event_handlers/mod_snmp|g' ${WRKSRC}/modules.conf .endif -.if defined(WITH_MODXMLCURL) +.if ${PORT_OPTIONS:MMODXMLCURL} @${REINPLACE_CMD} -e 's|#xml_int/mod_xml_curl|xml_int/mod_xml_curl|g' ${WRKSRC}/modules.conf .endif -.if !defined(WITH_MODDPASTERISK) +.if empty(PORT_OPTIONS:MMODDPASTERISK) @${REINPLACE_CMD} -e 's|dialplans/mod_dialplan_asterisk|#dialplans/mod_dialplan_asterisk|g' ${WRKSRC}/modules.conf .endif -.if defined(WITH_MODEVENTZMQ) +.if ${PORT_OPTIONS:MMODEVENTZMQ} @${REINPLACE_CMD} -e 's|#event_handlers/mod_event_zmq|event_handlers/mod_event_zmq|g' ${WRKSRC}/modules.conf .endif -.if defined(WITH_MODXMLODBC) +.if ${PORT_OPTIONS:MMODXMLODBC} @${REINPLACE_CMD} -e 's|#../../contrib/mod/xml_int/mod_xml_odbc|../../contrib/mod/xml_int/mod_xml_odbc|g' ${WRKSRC}/modules.conf .endif -.if defined(WITH_MODPOSIXTIMER) +.if ${PORT_OPTIONS:MMODPOSIXTIMER} @${REINPLACE_CMD} -e 's|#timers/mod_posix_timer|timers/mod_posix_timer|g' ${WRKSRC}/modules.conf .endif @@ -334,7 +356,7 @@ pre-install: @${CHMOD} 664 ${WRKSRC}/libs/freetdm/conf/* @${MKDIR} ${ETCDIR}/conf @${TOUCH} ${ETCDIR}/conf/.freeswitch-core-devel -.if defined(WITH_MODFREETDM) +.if ${PORT_OPTIONS:MMODFREETDM) @${MKDIR} ${ETCDIR}/conf/autoload_configs .endif Modified: head/net/freeswitch-core-devel/distinfo ============================================================================== --- head/net/freeswitch-core-devel/distinfo Thu Aug 16 20:39:11 2012 (r302658) +++ head/net/freeswitch-core-devel/distinfo Thu Aug 16 21:20:28 2012 (r302659) @@ -1,5 +1,5 @@ -SHA256 (freeswitch/freeswitch-1.2.rc2.tar.bz2) = bbf9b3f6e7a7569b9594b5852d1b8a95266ef3276df222776ac84667adb6cc08 -SIZE (freeswitch/freeswitch-1.2.rc2.tar.bz2) = 38075354 +SHA256 (freeswitch/freeswitch-1.2.1.tar.bz2) = 655fda7e37cae1c5ca1f7d789efcf008592904adc6eb9cdee72fc4bdc364c788 +SIZE (freeswitch/freeswitch-1.2.1.tar.bz2) = 37890105 SHA256 (freeswitch/opus-0.9.0.tar.gz) = b2f75c4ac5ab837845eb028413fae2a28754bfb0a6d76416e2af1441ef447649 SIZE (freeswitch/opus-0.9.0.tar.gz) = 1255227 SHA256 (freeswitch/celt-0.10.0.tar.gz) = 147c5bc8c6a37b2ad2c8b8af17c91cb35494421ec9b68110018a4bcec72e45dc Modified: head/net/freeswitch-core-devel/files/patch-build-getlib.sh.in ============================================================================== --- head/net/freeswitch-core-devel/files/patch-build-getlib.sh.in Thu Aug 16 20:39:11 2012 (r302658) +++ head/net/freeswitch-core-devel/files/patch-build-getlib.sh.in Thu Aug 16 21:20:28 2012 (r302659) @@ -1,16 +1,16 @@ ---- build/getlib.sh.in.orig 2011-11-03 00:15:31.000000000 -0400 -+++ build/getlib.sh.in 2011-11-03 02:05:01.000000000 -0400 -@@ -7,10 +7,10 @@ +--- build/getlib.sh.in ++++ build/getlib.sh.in +@@ -8,10 +8,10 @@ XZ=@XZ@ WGET=@WGET@ CURL=@CURL@ -if [ -f "$WGET" ]; then -- DOWNLOAD_CMD=$WGET +- DOWNLOAD_CMD=$WGET -elif [ -f "$CURL" ]; then +if [ -f "$CURL" ]; then - DOWNLOAD_CMD="$CURL -O" + DOWNLOAD_CMD="$CURL -O" +elif [ -f "$WGET" ]; then -+ DOWNLOAD_CMD=$WGET ++ DOWNLOAD_CMD=$WGET fi if [ -n "`echo $1 | grep '://'`" ]; then Modified: head/net/freeswitch-core-devel/files/patch-conf-vanilla-sip_profiles-internal.xml ============================================================================== --- head/net/freeswitch-core-devel/files/patch-conf-vanilla-sip_profiles-internal.xml Thu Aug 16 20:39:11 2012 (r302658) +++ head/net/freeswitch-core-devel/files/patch-conf-vanilla-sip_profiles-internal.xml Thu Aug 16 21:20:28 2012 (r302659) @@ -1,14 +1,11 @@ --- conf/vanilla/sip_profiles/internal.xml +++ conf/vanilla/sip_profiles/internal.xml -@@ -379,7 +379,10 @@ - It's probably not what you want so stick with the default unless you really need to change this. - --> - -- -+ -+ -+ +@@ -387,5 +387,8 @@ + --> + + ++ ++ + - Added: head/net/freeswitch-core-devel/files/patch-libs-js-nsprpub-pr-include-md-_freebsd.cfg ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/freeswitch-core-devel/files/patch-libs-js-nsprpub-pr-include-md-_freebsd.cfg Thu Aug 16 21:20:28 2012 (r302659) @@ -0,0 +1,112 @@ +--- libs/js/nsprpub/pr/include/md/_freebsd.cfg ++++ libs/js/nsprpub/pr/include/md/_freebsd.cfg +@@ -141,6 +141,109 @@ + #define PR_ALIGN_OF_DOUBLE 8 + #define PR_ALIGN_OF_POINTER 8 + ++#elif defined(__arm__) ++ ++#define IS_LITTLE_ENDIAN 1 ++#undef IS_BIG_ENDIAN ++#define HAVE_LONG_LONG ++#define HAVE_ALIGNED_DOUBLES ++#define HAVE_ALIGNED_LONGLONGS ++ ++#define PR_BYTES_PER_BYTE 1 ++#define PR_BYTES_PER_SHORT 2 ++#define PR_BYTES_PER_INT 4 ++#define PR_BYTES_PER_INT64 8 ++#define PR_BYTES_PER_LONG 4 ++#define PR_BYTES_PER_FLOAT 4 ++#define PR_BYTES_PER_DOUBLE 8 ++#define PR_BYTES_PER_WORD 4 ++#define PR_BYTES_PER_DWORD 8 ++ ++#define PR_BITS_PER_BYTE 8 ++#define PR_BITS_PER_SHORT 16 ++#define PR_BITS_PER_INT 32 ++#define PR_BITS_PER_INT64 64 ++#define PR_BITS_PER_LONG 32 ++#define PR_BITS_PER_FLOAT 32 ++#define PR_BITS_PER_DOUBLE 64 ++#define PR_BITS_PER_WORD 32 ++ ++#define PR_BITS_PER_BYTE_LOG2 3 ++#define PR_BITS_PER_SHORT_LOG2 4 ++#define PR_BITS_PER_INT_LOG2 5 ++#define PR_BITS_PER_INT64_LOG2 6 ++#define PR_BITS_PER_LONG_LOG2 5 ++#define PR_BITS_PER_FLOAT_LOG2 5 ++#define PR_BITS_PER_DOUBLE_LOG2 6 ++#define PR_BITS_PER_WORD_LOG2 5 ++ ++#define PR_ALIGN_OF_SHORT 2 ++#define PR_ALIGN_OF_INT 4 ++#define PR_ALIGN_OF_LONG 4 ++#define PR_ALIGN_OF_INT64 4 ++#define PR_ALIGN_OF_FLOAT 4 ++#define PR_ALIGN_OF_DOUBLE 4 ++#define PR_ALIGN_OF_POINTER 4 ++#define PR_ALIGN_OF_WORD 4 ++ ++#define PR_BYTES_PER_WORD_LOG2 2 ++#define PR_BYTES_PER_DWORD_LOG2 3 ++ ++#elif defined(__mips__) ++ ++#ifdef __MIPSEB__ ++#define IS_BIG_ENDIAN 1 ++#undef IS_LITTLE_ENDIAN ++#elif defined(__MIPSEL__) ++#define IS_LITTLE_ENDIAN 1 ++#undef IS_BIG_ENDIAN ++#else ++#error "Unknown MIPS endianness." ++#endif ++#define HAVE_LONG_LONG ++#define HAVE_ALIGNED_DOUBLES ++#define HAVE_ALIGNED_LONGLONGS ++ ++#define PR_BYTES_PER_BYTE 1 ++#define PR_BYTES_PER_SHORT 2 ++#define PR_BYTES_PER_INT 4 ++#define PR_BYTES_PER_INT64 8 ++#define PR_BYTES_PER_LONG 4 ++#define PR_BYTES_PER_FLOAT 4 ++#define PR_BYTES_PER_DOUBLE 8 ++#define PR_BYTES_PER_WORD 4 ++#define PR_BYTES_PER_DWORD 8 ++ ++#define PR_BITS_PER_BYTE 8 ++#define PR_BITS_PER_SHORT 16 ++#define PR_BITS_PER_INT 32 ++#define PR_BITS_PER_INT64 64 ++#define PR_BITS_PER_LONG 32 ++#define PR_BITS_PER_FLOAT 32 ++#define PR_BITS_PER_DOUBLE 64 ++#define PR_BITS_PER_WORD 32 ++ ++#define PR_BITS_PER_BYTE_LOG2 3 ++#define PR_BITS_PER_SHORT_LOG2 4 ++#define PR_BITS_PER_INT_LOG2 5 ++#define PR_BITS_PER_INT64_LOG2 6 ++#define PR_BITS_PER_LONG_LOG2 5 ++#define PR_BITS_PER_FLOAT_LOG2 5 ++#define PR_BITS_PER_DOUBLE_LOG2 6 ++#define PR_BITS_PER_WORD_LOG2 5 ++ ++#define PR_ALIGN_OF_SHORT 2 ++#define PR_ALIGN_OF_INT 4 ++#define PR_ALIGN_OF_LONG 4 ++#define PR_ALIGN_OF_INT64 8 ++#define PR_ALIGN_OF_FLOAT 4 ++#define PR_ALIGN_OF_DOUBLE 8 ++#define PR_ALIGN_OF_POINTER 4 ++#define PR_ALIGN_OF_WORD 4 ++ ++#define PR_BYTES_PER_WORD_LOG2 2 ++#define PR_BYTES_PER_DWORD_LOG2 3 ++ + #elif defined(__sparc__) + + #undef IS_LITTLE_ENDIAN Added: head/net/freeswitch-core-devel/files/patch-libs-js-nsprpub-pr-include-md-_freebsd.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/freeswitch-core-devel/files/patch-libs-js-nsprpub-pr-include-md-_freebsd.h Thu Aug 16 21:20:28 2012 (r302659) @@ -0,0 +1,16 @@ +--- libs/js/nsprpub/pr/include/md/_freebsd.h ++++ libs/js/nsprpub/pr/include/md/_freebsd.h +@@ -57,7 +57,13 @@ + #define _PR_SI_ARCHITECTURE "ia64" + #elif defined(__amd64__) + #define _PR_SI_ARCHITECTURE "amd64" ++#elif defined(__arm__) ++#define _PR_SI_ARCHITECTURE "arm" ++#elif defined(__mips__) ++#define _PR_SI_ARCHITECTURE "mips" ++ + #else ++ + #error "Unknown CPU architecture" + #endif + #if defined(__ELF__) Modified: head/net/freeswitch-core-devel/pkg-plist ============================================================================== --- head/net/freeswitch-core-devel/pkg-plist Thu Aug 16 20:39:11 2012 (r302658) +++ head/net/freeswitch-core-devel/pkg-plist Thu Aug 16 21:20:28 2012 (r302659) @@ -184,8 +184,8 @@ lib/freeswitch/mod/mod_hash.so %%MODHTTAPI%%lib/freeswitch/mod/mod_httapi.so %%MODHTTPCACHE%%lib/freeswitch/mod/mod_http_cache.la %%MODHTTPCACHE%%lib/freeswitch/mod/mod_http_cache.so -lib/freeswitch/mod/mod_ilbc.la -lib/freeswitch/mod/mod_ilbc.so +%%MODILBC%%lib/freeswitch/mod/mod_ilbc.la +%%MODILBC%%lib/freeswitch/mod/mod_ilbc.so %%MODISAC%%lib/freeswitch/mod/mod_isac.la %%MODISAC%%lib/freeswitch/mod/mod_isac.so %%MODLADSPA%%lib/freeswitch/mod/mod_ladspa.la @@ -254,8 +254,8 @@ lib/freeswitch/mod/mod_native_file.so %%MODSHOUT%%lib/freeswitch/mod/mod_shout.so %%MODSILK%%lib/freeswitch/mod/mod_silk.la %%MODSILK%%lib/freeswitch/mod/mod_silk.so -lib/freeswitch/mod/mod_siren.la -lib/freeswitch/mod/mod_siren.so +%%MODSIREN%%lib/freeswitch/mod/mod_siren.la +%%MODSIREN%%lib/freeswitch/mod/mod_siren.so %%MODSKINNY%%lib/freeswitch/mod/mod_skinny.la %%MODSKINNY%%lib/freeswitch/mod/mod_skinny.so lib/freeswitch/mod/mod_sms.la @@ -308,12 +308,16 @@ lib/freeswitch/mod/mod_voicemail.la lib/freeswitch/mod/mod_voicemail.so %%MODVOICEMAILIVR%%lib/freeswitch/mod/mod_voicemail_ivr.la %%MODVOICEMAILIVR%%lib/freeswitch/mod/mod_voicemail_ivr.so +lib/freeswitch/mod/mod_vp8.la +lib/freeswitch/mod/mod_vp8.so lib/freeswitch/mod/mod_xml_cdr.la lib/freeswitch/mod/mod_xml_cdr.so %%MODXMLCURL%%lib/freeswitch/mod/mod_xml_curl.la %%MODXMLCURL%%lib/freeswitch/mod/mod_xml_curl.so lib/freeswitch/mod/mod_xml_rpc.la lib/freeswitch/mod/mod_xml_rpc.so +lib/freeswitch/mod/mod_xml_scgi.la +lib/freeswitch/mod/mod_xml_scgi.so %%MODPYTHON%%lib/python2.7/site-packages/freeswitch.py libdata/pkgconfig/freeswitch.pc %%MODFREETDM%%libdata/pkgconfig/freetdm.pc @@ -327,15 +331,16 @@ www/freeswitch/htdocs/slimtest.htm.sampl @dirrm www/freeswitch @dirrmtry share/freeswitch/sounds @dirrmtry share/freeswitch -%%MODPERL%%@dirrm perl +%%MODPYTHON%%@dirrmtry lib/python2.7/site-packages +%%MODPERL%%@dirrmtry perl @dirrm lib/freeswitch/mod @dirrm lib/freeswitch/lib @dirrm lib/freeswitch @dirrm include/freeswitch @dirrm %%ETCDIR%%/scripts -%%MODPOCKETSPHINX%%@dirrm %%ETCDIR%%/grammar/model/communicator -%%MODPOCKETSPHINX%%@dirrm %%ETCDIR%%/grammar/model -@dirrm %%ETCDIR%%/grammar +%%MODPOCKETSPHINX%%@dirrmtry %%ETCDIR%%/grammar/model/communicator +%%MODPOCKETSPHINX%%@dirrmtry %%ETCDIR%%/grammar/model +@dirrmtry %%ETCDIR%%/grammar @dirrmtry %%ETCDIR%%/conf/directory/default @dirrmtry %%ETCDIR%%/conf/directory/ @dirrmtry %%ETCDIR%%/conf/autoload_configs