ports/165675: Update of net/freeswitch-core
Rich E Neese
r.neese at gmail.com
Sun Mar 4 01:30:08 UTC 2012
The following reply was made to PR ports/165675; it has been noted by GNATS.
From: Rich E Neese <r.neese at gmail.com>
To: FreeBSD-gnats-submit at FreeBSD.org, freebsd-ports-bugs at FreeBSD.org
Cc:
Subject: Re: ports/165675: Update of net/freeswitch-core
Date: Sat, 03 Mar 2012 20:01:23 -0500
This is a multi-part message in MIME format.
--------------030407060206080908020907
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
On 3/3/2012 20:00, FreeBSD-gnats-submit at FreeBSD.org wrote:
> Thank you very much for your problem report.
> It has the internal identification `ports/165675'.
> The individual assigned to look at your
> report is: freebsd-ports-bugs.
>
> You can access the state of your problem report at any time
> via this link:
>
> http://www.freebsd.org/cgi/query-pr.cgi?pr=165675
>
>> Category: ports
>> Responsible: freebsd-ports-bugs
>> Synopsis: Update of net/freeswitch-core
>> Arrival-Date: Sun Mar 04 01:00:05 UTC 2012
--------------030407060206080908020907
Content-Type: text/plain;
name="freeswitch-core.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="freeswitch-core.diff"
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net/freeswitch-core/Makefile,v
retrieving revision 1.25
diff -u -r1.25 Makefile
--- Makefile 6 Feb 2012 12:25:45 -0000 1.25
+++ Makefile 3 Mar 2012 20:03:33 -0000
@@ -6,9 +6,9 @@
#
PORTNAME= freeswitch-core
-PORTVERSION= 1.0.7.1
+PORTVERSION= 1.2.0
+PORTREVISION= pre1
PORTEPOCH= 1
-PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= http://dl.dropbox.com/u/152504/ \
http://files.freeswitch.org/downloads/libs/:2 \
@@ -51,23 +51,30 @@
USE_RC_SUBR= freeswitch
HAS_CONFIGURE= yes
USE_LDCONFIG= yes
-LDFLAGS+= -L${LOCALBASE}/lib
-INCLUDES+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
+INCLUDES= -I${LOCALBASE}/include
CONFIGURE_ARGS+=--prefix=${PREFIX} \
--bindir=${PREFIX}/bin \
- --sysconfdir=${PREFIX}/etc/${BASE_PORTNAME}/conf \
+ --datadir=${VARBASE}/db/${BASE_PORTNAME} \
+ --htmldir=${PREFIX}/www/freeswitch/htdocs \
--includedir=${PREFIX}/include/${BASE_PORTNAME} \
--libdir=${PREFIX}/lib/${BASE_PORTNAME}/lib \
- --localstatedir="${VARBASE}" \
+ --localstatedir=${VARBASE} \
+ --sysconfdir=${PREFIX}/etc/${BASE_PORTNAME}/conf \
+ --with-soundsdir=${PREFIX}/share/freeswitch/sounds \
+ --with-grammardir=${PREFIX}/etc/${BASE_PORTNAME}/grammar \
+ --with-scriptsdir=${PREFIX}/etc/${BASE_PORTNAME}/scripts \
--with-modinstdir=${PREFIX}/lib/${BASE_PORTNAME}/mod \
--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \
- --with-libgnutls-prefix=${LOCALBASE} \
+ --with-logfiledir=${VARBASE}/log/${BASE_PORTNAME} \
+ --with-storagedir=${VARBASE}/${BASE_PORTNAME} \
+ --with-recordingsdir=${VARBASE}/${BASE_PORTNAME}/recordings \
+ --with-voicemaildir=${VARBASE}/spool/${BASE_PORTNAME}/voicemail \
--with-ogg=${LOCALBASE} \
--with-ogg-libraries=${LOCALBASE}/lib \
--with-ogg-includes=${LOCALBASE}/include
-CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" \
- INCLUDES="${INCLUDES}" \
+CONFIGURE_ENV+= INCLUDES="${INCLUDES}" \
PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
@@ -85,66 +92,76 @@
VARBASE?= /var
-OPTIONS= MODSHOUT "Enable mod_shout (streaming audio/mp3)" on \
- MODFLITE "Enable mod_flite (Text to Speech)" on \
- MODUNIMRCP "Enable mod_unimrcp tts" off \
- MODTTSCMDLINE "Enable mod_tts_commandline" on \
- MODPOCKETSPHINX "Enable mod_pockectsphinx (voice control)" on \
- MODCIDLOOKUP "Enable mod_cidlookup()" on \
- MODDPDIRECTORY "Enable mod_dialplan_directory()" off \
- MODDIRECTORY "Enable mod_directory(dial name directory)" on \
- MODDINGALING "Enable mod_dingaling(google talk)" on \
- MODEASYROUTE "Enable mod_easyroute(routing tool)" on \
- MODERLANGEVENT "Enable mod_erlang_event (Call Center Dist)" off \
- MODLCR "Enable mod_lcr (least cost routing)" on \
- MODSOUNDTOUCH "Enable mod_soundtouch(Audio Effects)" on \
- MODRSS "Enable mod_rss (rss feed reader)" on \
- MODSNOM "Enable mod_snom (snom control)" on \
- MODAVMD "Enable mod_avmd (Adavced v-mail detection)" on \
- MODVMD "Enable mod_vmd (voice mail detection)" off \
- MODSPY "Enable mod_spy(listen/breaking on calls)" on \
- MODAMRWB "Enable mod_amrwb (amrwb codec)" on \
- MODCELT "Enable mod_celt (celt 48k codec)" on \
- MODSILK "Enable mod_silk (Silk Codec)" on \
- MODCODEC2 "Enable mod_codec2 (Codec2 codec)" on \
- MODOPUS "Enable mod_opus codec (Opus codec)" on \
- MODFREETDM "Enable mod_freetdm (TDM Cards )" off \
- MODSKINNY "Enable mod_skinny (Skinny Support)" on \
- MODMEMCACHE "Enable mod_memcache ()" on \
- MODMULTICAST "Enable mod_event_multicast()" on \
- MODNIBBLEBILL "Enable mod_nibblebill (billing)" on \
- MODPORTAUDIO "Enable mod_portaudio(souncard portaudio)" on \
- MODPASTREAM "Enable mod_portaudio_stream (new)" on \
- MODSHELLSTREAM "Enable mod_shell_stream (new)" on \
- MODPERL "Enable mod_perl (perl support)" off \
- MODPYTHON "Enable mod_python (python support)" off \
- MODCURL "Enable mod_curl" on \
- MODXMLCURL "Enable mod_xml_curl" on \
- MODDISTRIBUTOR "Enable mod_distributor(c\# .net api)" off \
- MODSNAPSHOT "Enable mod_snapshot (testing)" off \
- MODSAYDE "Enable mod_say_de (German support)" off \
- MODSAYES "Enable mod_say_se (Spanish support)" off \
- MODSAYEN "Enable mod_say_en (English support)" on \
- MODSAYHE "Enable mod_say_he (Hebrew support)" off \
- MODSAYHU "Enable mod_say_hu (Hungarian support)" off \
- MODSAYFR "Enable mod_say_fr (French support)" off \
- MODSAYIT "Enable mod_say_it (Italian support)" off \
- MODSAYNL "Enable mod_say_nl (Dutch support)" off \
- MODSAYRU "Enable mod_say_ru (Russian support)" off \
- MODSAYTH "Enable mod_say_th (Thi support)" off \
- MODSAYZH "Enable mod_say_zh (Chinese support)" off \
- EXTENSIONS "Include Default User Extensions" off \
- MODCALLCENTER "Enable mod_callcenter (callcenter que)" on \
- MODFSK "Enablle mod_fsck (caller_id related)" on \
- MODCDRPGCSV "Enable mod_cdr_pg_csv( broken on 9.x )" off \
- MODSNMP "Enable mod_snmp (network monitoring)" on \
- MODLADSPA "Enable mod_ladspa(voice changer)(new)" on \
- MODRTMP "Enable mod_rtmp(realtime media protocol)" on \
- MODDPASTERISK "Enable mod_dialplan_asterisk(* dialplan)" off \
- MODBLACKLIST "Enable mod_blacklist(Black list numbers)" on \
- MODHTTPCACHE "Enable mod_http_cache(new)" on \
- MODEVENTZMQ "Enable mod_event_zmq(build issues)(new)" on \
- SAMPLECONFIGS "Enable Sample Configurations" on
+OPTIONS= 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" on \
+ MODDISTRIBUTOR "Simple round-robin style distributions" oN \
+ MODEASYROUTE "DID Database lookup" on \
+ MODFSK "FSK (Frequency-Shift Keying) data transfer" on \
+ MODHTTPCACHE "HTTP GET with caching" on \
+ MODDIRECTORY "Dial by name directory" on \
+ MODLADSPA "use Auto-tune on your call" on \
+ MODLCR "Least Cost Routing" on \
+ MODMEMCACHE "Memcached API" on \
+ MODMONGO "Mongo/CouchDB (Broken/Build issues)" off \
+ MODNIBBLEBILL "Billing Module" off \
+ MODRSS "RSS feed text to speech" on \
+ MODSNOM "Controlling softkeys on Snom phones" off \
+ MODSPY "Extension/Call Spy tool" on \
+ MODSOUNDTOUCH "Pitch shifting audio effects" off \
+ 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 \
+ MPDPOCKETSPHINX "Free open source Speech Recognition" on \
+ MODTTSCMDLNE "Play Sounds via commandline" on \
+ MODUNIMRCP "Open MRCP implementation ASR/Text " on \
+ MODCDRPGCSV "Asterisk Compatible CDR PostgreSQL" off \
+ MODERLANGEVENT "send/receive events/commands in Erlang" off \
+ MODMULTICAST "Broadcasts events to netmask" on \
+ MODEVENTZMQ "Zeroconf config socket" on \
+ MODSNMP "SNMP AgentX module" off \
+ MODPASTREAM "PortAudio Streaming Module" on \
+ MODSHELLSTREAM "Stream audio via shell command" on \
+ MODSHOUT "Play local mp3 files any rate" on \
+ MODMANAGED "Common Language Infrastructure API" off \
+ MODPERL "Perl Lang Support" on \
+ MODPYTHON "Python Lang Suppot" on \
+ MODPOSIXTIMER "Posix timer (New/Testing)" off \
+ MODXMLCURL "XML dynamically control of FreeSWITCH" 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 "Portaguies Voice Propmts" off \
+ MODSAYRU "Russian Voice Propmts" off \
+ MODSAYTH "Thi Voice Propmts" off \
+ MODSAYZH "Chinese Voice Propmts" off \
+ EXTENSIONS "Include Default User Extensions" off \
+ SAMPLECONFIGS "Include Sample Configurations" off \
+ DEBUGMODEOFF "Turn off Debug logging" on
.include <bsd.port.options.mk>
@@ -154,10 +171,11 @@
.for i in MODFLITE MODPOCKETSPHINX MODCIDLOOKUP MODDPDIRECTORY MODEASYROUTE MODLCR MODSOUNDTOUCH MODRSS \
MODSNOM MODAVMD MODVMD MODSPY MODAMRWB MODCELT MODMULTICAST MODPORTAUDIO MODCURL MODXMLCURL \
- MODSAYDE MODSAYEN MODSAYES MODSAYFR MODSAYHE MODSAYHU MODSAYIT MODSAYNL MODSAYRU MODSAYTH MODSAYZH \
- MODNIBBLEBILL MODDINGALING MODDIRECTORY MODMEMCACHE MODPASTREAM MODSHELLSTREAM MODSILK MODUNIMRCP \
- MODTTSCMDLINE MODDISTRIBUTOR MODSNAPSHOT MODSKINNY EXTENSIONS MODCALLCENTER MODCODEC2 MODFSK MODOPUS \
- MODDPASTERISK MODRTMP SAMPLECONFIGS MODBLACKLIST MODHTTPCACHE MODEVENTZMQ
+ MODSAYDE MODSAYEN MODSAYES MODSAYFR MODSAYHE MODSAYHU MODSAYIT MODSAYNL MODSAYPT MODSAYRU MODSAYTH MODSAYZH \
+ MODNIBBLEBILL MODDINGALING MODDIRECTORY MODMEMCACHE MODPASTREAM MODSHELLSTREAM MODSILK MODUNIMRCP \
+ MODTTSCMDLINE MODDISTRIBUTOR MODSNAPSHOT MODSKINNY EXTENSIONS MODCALLCENTER MODCODEC2 MODOPUS MODFSK \
+ MODDPASTERISK MODRTMP SAMPLECONFIGS MODBLACKLIST MODHTTPCACHE MODEVENTZMQ MODKHOMP MODXMLODBC \
+ MODPOSIXTIMER MODABSTRACTION MODVOICEMAILIVR MODISAC
.if !defined(WITH_${i})
PLIST_SUB+= WITH_${i}="@comment "
.else
@@ -241,6 +259,21 @@
${LOCALBASE}/lib/ladspa/autotalent.so:${PORTSDIR}/audio/autotalent
.endif
+.if !defined(WITH_MODMONGO)
+PLIST_SUB+= WITH_MODMONGO="@comment "
+.else
+USE_SCONS= yes
+SCONS_TARGET= all
+SCONS_ARGS= --prefix=${PREFIX} --cxx=${CXX} --cpp=${CPP} --use-system-all
+PLIST_SUB+= WITH_MODMONGO=""
+LIB_DEPENDS+= boost_system:${PORTSDIR}/devel/boost-libs \
+ execinfo.1:${PORTSDIR}/devel/libexecinfo \
+ nspr4:${PORTSDIR}/devel/nspr \
+ pcre:${PORTSDIR}/devel/pcre \
+ snappy:${PORTSDIR}/archivers/snappy
+.endif
+
+
# FreeBSD 7 doesn't have lrintl, but lrint will do the trick just fine
# It's quite cryptic as to why the reinplace doesn't work; there's no mention
# of lrintl anywhere in any source....
@@ -250,16 +283,22 @@
BROKEN= Requires lrintl, which is not present on FreeBSD 7
.endif
-post-extract:
-.for file in ${DISTFILES:M*\:[23]:C/\:[23]//}
- @${CP} ${DISTDIR}/${DIST_SUBDIR}/${file} ${WRKSRC}/libs/
-.endfor
+#post-extract:
+#.for ${file} in ${DISTFILES:M*\:[23]:C/\:[23]//}
+# @${CP} ${DISTDIR}/${DIST_SUBDIR}/${file} ${WRKSRC}/libs/
+#.endfor
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.10|g' ${WRKSRC}/src/mod/event_handlers/mod_event_zmq/Makefile
+ @${REINPLACE_CMD} -e 's|<param name="log-auth-failures" value="false"/>|<param name="log-auth-failures" value="true"/>|g' ${WRKSRC}/conf/sip_profiles/internal.xml
+ @${REINPLACE_CMD} -e 's|storage_dir|voicemail_dir|g' ${WRKSRC}/conf/autoload_configs/voicemail.conf.xml
+ @${REINPLACE_CMD} -e 's|storage_dir|voicemail_dir|g' ${WRKSRC}/src/mod/applications/mod_voicemail/mod_voicemail.c
+.if defined(WITH_DEBUGMODEOFF)
+ @${REINPLACE_CMD} -e 's|<param name="loglevel" value="debug"/>|<param name="loglevel" value="alert"/>|g' ${WRKSRC}/conf/autoload_configs/switch.conf.xml
+.endif
.if !defined(WITH_SAMPLECONFIGS)
- @${REINPLACE_CMD} -e 's|$$(MAKE) samples-conf|##$$(MAKE) samples-conf|g' ${WRKSRC}/Makefile.am
+ @${REINPLACE_CMD} -e 's|\$$(MAKE) samples-conf|##\$$(MAKE) samples-conf|g' ${WRKSRC}/Makefile.am
.endif
cd ${WRKSRC} && ./bootstrap.sh
@@ -274,12 +313,13 @@
.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_snapshot mod_callcenter mod_fsk mod_ladspa mod_blacklist mod_http_cache mod_mongo \
+ mod_abstraction mod_voicemail_ivr
.if defined(WITH_${i:C/_//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
+.for i in mod_amrwb mod_celt mod_silk mod_codec2 mod_opus mod_isac
.if defined(WITH_${i:C/_//g:U})
@${REINPLACE_CMD} -e 's|#\(codecs/${i}\)|\1|g' ${WRKSRC}/modules.conf
.endif
@@ -292,7 +332,7 @@
.if defined(WITH_MODPASTREAM)
@${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_ru mod_say_th mod_say_zh
+.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:C/_//g:U})
@${REINPLACE_CMD} -e 's|#\(say/${i}\)|\1|g' ${WRKSRC}/modules.conf
.endif
@@ -302,7 +342,7 @@
@${REINPLACE_CMD} -e 's|#\(languages/${i}\)|\1|g' ${WRKSRC}/modules.conf
.endif
.endfor
-.for i in mod_skinny mod_portaudio mod_dingaling mod_rtmp
+.for i in mod_skinny mod_portaudio mod_dingaling mod_rtmp mod_khomp
.if defined(WITH_${i:C/_//g:U})
@${REINPLACE_CMD} -e 's|#\(endpoints/${i}\)|\1|g' ${WRKSRC}/modules.conf
.endif
@@ -322,6 +362,9 @@
.if defined(WITH_MODCDRPGCSV)
@${REINPLACE_CMD} -e 's|#event_handlers/mod_cdr_pg_csv|event_handlers/mod_cdr_pg_csv|g' ${WRKSRC}/modules.conf
.endif
+.if defined(WITH_MODCDRMONGO)
+ @${REINPLACE_CMD} -e 's|#event_handlers/mod_cdr_mongodb|event_handlers/mod_cdr_mongodb|g' ${WRKSRC}/modules.conf
+.endif
.if defined(WITH_MODSNMP)
@${REINPLACE_CMD} -e 's|#event_handlers/mod_snmp|event_handlers/mod_snmp|g' ${WRKSRC}/modules.conf
.endif
@@ -334,16 +377,18 @@
.if defined(WITH_MODEVENTZMQ)
@${REINPLACE_CMD} -e 's|#event_handlers/mod_event_zmq|event_handlers/mod_event_zmq|g' ${WRKSRC}/modules.conf
.endif
+.if defined(WITH_MODXMLODBC)
+ @${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)
+ @${REINPLACE_CMD} -e 's|#timers/mod_posix_timer|timers/mod_posix_timer|g' ${WRKSRC}/modules.conf
+.endif
pre-install:
@${CHMOD} 664 ${WRKSRC}/libs/freetdm/conf/*
.if !defined(WITH_EXTENSIONS)
@${FIND} ${WRKSRC}/conf/directory/default -type f -name '*.xml' -delete
.endif
-
-post-install:
- @${SETENV} PKG_PREFIX=${PREFIX} \
- ${SH} ${PKGINSTALL} ${BASE_PORTNAME} POST-INSTALL
.if !defined(WITH_SAMPLECONFIGS)
@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf
@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/skinny_profiles
@@ -380,18 +425,21 @@
@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/dialplan/public
@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/dialplan/default
@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/dialplan
+ @${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/chatplan
@${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/autoload_configs
+ @${FIND} ${PREFIX}/etc/${BASE_PORTNAME}/. -type d | ${XARGS} ${CHMOD} 774
.endif
-.if !defined(WITH_EXTENSIONS)
- @${MKDIR} ${PREFIX}/etc/${BASE_PORTNAME}/conf/directory/default
-.endif
+
+post-install:
+ @${SETENV} PKG_PREFIX=${PREFIX} \
+ ${SH} ${PKGINSTALL} ${BASE_PORTNAME} POST-INSTALL
@${FIND} ${PREFIX}/etc/${BASE_PORTNAME}/. -type d | ${XARGS} ${CHMOD} 774
@${MKDIR} ${PREFIX}/share/${BASE_PORTNAME}/sounds
@${CHMOD} -R 774 ${PREFIX}/share/${BASE_PORTNAME}
+ @for i in $$(${FIND} ${PREFIX}/www/${BASE_PORTNAME}/htdocs/ -type f -name '*.sample'); do if [ ! -f $${i%.sample} ]; then ${CP} -p $$i $${i%.sample}; fi; done
.if defined(WITH_SAMPLECONFIGS)
@for i in $$(${FIND} ${PREFIX}/etc/${BASE_PORTNAME}/conf/ -type f -name '*.sample'); do if [ ! -f $${i%.sample} ]; then ${CP} -p $$i $${i%.sample}; fi; done
.endif
- @for i in $$(${FIND} ${PREFIX}/www/${BASE_PORTNAME}/htdocs/ -type f -name '*.sample'); do if [ ! -f $${i%.sample} ]; then ${CP} -p $$i $${i%.sample}; fi; done
@${CAT} ${PKGMESSAGE}
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/net/freeswitch-core/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- distinfo 30 Oct 2011 19:31:57 -0000 1.5
+++ distinfo 3 Mar 2012 20:03:33 -0000
@@ -1,5 +1,5 @@
-SHA256 (freeswitch/freeswitch-1.0.7.1.tar.gz) = 180db5eb11bc35d383a143ee17ed15092ca1f0651afe93fe6fc2b7f7c35e4dbb
-SIZE (freeswitch/freeswitch-1.0.7.1.tar.gz) = 36116764
+SHA256 (freeswitch/freeswitch-1.2.0.tar.gz) = 7ad1031e039687e58d6c75ac18955313b6e739c1b2cdfae80a681d6193cd8b0a
+SIZE (freeswitch/freeswitch-1.2.0.tar.gz) = 45513235
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
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/net/freeswitch-core/pkg-plist,v
retrieving revision 1.8
diff -u -r1.8 pkg-plist
--- pkg-plist 30 Oct 2011 19:31:57 -0000 1.8
+++ pkg-plist 3 Mar 2012 20:03:33 -0000
@@ -250,6 +250,8 @@
%%WITH_MODFREETDM%%lib/freeswitch/mod/ftmod_skel.so
%%WITH_MODFREETDM%%lib/freeswitch/mod/ftmod_zt.la
%%WITH_MODFREETDM%%lib/freeswitch/mod/ftmod_zt.so
+%%WITH_MODABSTRACTION%%lib/freeswitch/mod/mod_abstraction.la
+%%WITH_MODABSTRACTION%%lib/freeswitch/mod/mod_abstraction.so
lib/freeswitch/mod/mod_amr.la
lib/freeswitch/mod/mod_amr.so
%%WITH_MODAMRWB%%lib/freeswitch/mod/mod_amrwb.la
@@ -334,10 +336,14 @@
lib/freeswitch/mod/mod_h26x.so
lib/freeswitch/mod/mod_hash.la
lib/freeswitch/mod/mod_hash.so
+%%WITH_MODHTTAPI%%lib/freeswitch/mod/mod_httapi.la
+%%WITH_MODHTTAPI%%lib/freeswitch/mod/mod_httapi.so
%%WITH_MODHTTPCACHE%%lib/freeswitch/mod/mod_http_cache.la
%%WITH_MODHTTPCACHE%%lib/freeswitch/mod/mod_http_cache.so
lib/freeswitch/mod/mod_ilbc.la
lib/freeswitch/mod/mod_ilbc.so
+%%WITH_MODISAC%%lib/freeswitch/mod/mod_isac.la
+%%WITH_MODISAC%%lib/freeswitch/mod/mod_isac.so
%%WITH_MODLADSPA%%lib/freeswitch/mod/mod_ladspa.la
%%WITH_MODLADSPA%%lib/freeswitch/mod/mod_ladspa.so
%%WITH_MODLCR%%lib/freeswitch/mod/mod_lcr.la
@@ -352,6 +358,8 @@
lib/freeswitch/mod/mod_lua.so
%%WITH_MODMEMCACHE%%lib/freeswitch/mod/mod_memcache.la
%%WITH_MODMEMCACHE%%lib/freeswitch/mod/mod_memcache.so
+%%WITH_MODMONGO%%lib/freeswitch/mod/mod_mongo.la
+%%WITH_MODMONGO%%lib/freeswitch/mod/mod_mongo.so
lib/freeswitch/mod/mod_native_file.la
lib/freeswitch/mod/mod_native_file.so
%%WITH_MODNIBBLEBILL%%lib/freeswitch/mod/mod_nibblebill.la
@@ -366,6 +374,8 @@
%%WITH_MODPORTAUDIO%%lib/freeswitch/mod/mod_portaudio.so
%%WITH_MODPASTREAM%%lib/freeswitch/mod/mod_portaudio_stream.la
%%WITH_MODPASTREAM%%lib/freeswitch/mod/mod_portaudio_stream.so
+%%WITH_MODPOSIXTIMER%%lib/freeswitch/mod/mod_posix_timer.la
+%%WITH_MODPOSIXTIMER%%lib/freeswitch/mod/mod_posix_timer.so
%%WITH_MODPYTHON%%lib/freeswitch/mod/mod_python.la
%%WITH_MODPYTHON%%lib/freeswitch/mod/mod_python.so
%%WITH_MODRSS%%lib/freeswitch/mod/mod_rss.la
@@ -388,6 +398,8 @@
%%WITH_MODSAYIT%%lib/freeswitch/mod/mod_say_it.so
%%WITH_MODSAYNL%%lib/freeswitch/mod/mod_say_nl.la
%%WITH_MODSAYNL%%lib/freeswitch/mod/mod_say_nl.so
+%%WITH_MODSAYPT%%lib/freeswitch/mod/mod_say_pt.la
+%%WITH_MODSAYPT%%lib/freeswitch/mod/mod_say_pt.so
%%WITH_MODSAYRU%%lib/freeswitch/mod/mod_say_ru.la
%%WITH_MODSAYRU%%lib/freeswitch/mod/mod_say_ru.so
%%WITH_MODSAYTH%%lib/freeswitch/mod/mod_say_th.la
@@ -450,6 +462,8 @@
%%WITH_MODVMD%%lib/freeswitch/mod/mod_vmd.so
lib/freeswitch/mod/mod_voicemail.la
lib/freeswitch/mod/mod_voicemail.so
+%%WITH_MODVOICEMAILIVR%%lib/freeswitch/mod/mod_voicemail_ivr.la
+%%WITH_MODVOICEMAILIVR%%lib/freeswitch/mod/mod_voicemail_ivr.so
lib/freeswitch/mod/mod_xml_cdr.la
lib/freeswitch/mod/mod_xml_cdr.so
%%WITH_MODXMLCURL%%lib/freeswitch/mod/mod_xml_curl.la
Index: files/freeswitch.in
===================================================================
RCS file: /home/ncvs/ports/net/freeswitch-core/files/freeswitch.in,v
retrieving revision 1.7
diff -u -r1.7 freeswitch.in
--- files/freeswitch.in 14 Jan 2012 08:56:14 -0000 1.7
+++ files/freeswitch.in 3 Mar 2012 20:03:33 -0000
@@ -15,7 +15,7 @@
. /etc/rc.subr
name=freeswitch
-rcvar=freeswitch_enable
+rcvar=`set_rcvar`
load_rc_config $name
@@ -27,6 +27,8 @@
command=%%PREFIX%%/bin/freeswitch
command_args="-u ${freeswitch_user} -g ${freeswitch_group}"
+umask 002
+
pidfile=${freeswitch_pidfile:-"/var/run/freeswitch/freeswitch.pid"}
start_precmd="${name}_prestart"
@@ -40,6 +42,8 @@
freeswitch_prestart () {
install -d -o ${freeswitch_user} -m755 /var/run/${name}
+ sleep 7.7
+ %%PREFIX%%/bin/fs_cli -x "sofia recover"
}
run_rc_command "$1"
Index: files/patch-build-getlib.sh.in
===================================================================
RCS file: /home/ncvs/ports/net/freeswitch-core/files/patch-build-getlib.sh.in,v
retrieving revision 1.1
diff -u -r1.1 patch-build-getlib.sh.in
--- files/patch-build-getlib.sh.in 23 Dec 2010 15:36:23 -0000 1.1
+++ files/patch-build-getlib.sh.in 3 Mar 2012 20:03:33 -0000
@@ -1,18 +1,16 @@
---- build/getlib.sh.in 2010-12-22 12:39:49.000000000 -0500
-+++ build/getlib.sh.in.orig 2010-12-22 12:34:04.000000000 -0500
-@@ -5,11 +5,11 @@
+--- 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 @@
WGET=@WGET@
CURL=@CURL@
--if [ -f "$WGET" ] ; then
+-if [ -f "$WGET" ]; then
- DOWNLOAD_CMD=$WGET
--else
-- if [ -f "$CURL" ] ; then
-+if [ -f "$CURL" ] ; then
- DOWNLOAD_CMD="$CURL -O"
-+else
-+ if [ -f "$WGET" ] ; then
-+ DOWNLOAD_CMD=$WGET
- fi
+-elif [ -f "$CURL" ]; then
++if [ -f "$CURL" ]; then
+ DOWNLOAD_CMD="$CURL -O"
++elif [ -f "$WGET" ]; then
++ DOWNLOAD_CMD=$WGET
fi
+ if [ -n "`echo $1 | grep '://'`" ]; then
Index: files/patch-conf-autoload_configs-voicemail.conf.xml
===================================================================
RCS file: files/patch-conf-autoload_configs-voicemail.conf.xml
diff -N files/patch-conf-autoload_configs-voicemail.conf.xml
--- files/patch-conf-autoload_configs-voicemail.conf.xml 16 Jul 2010 14:57:42 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
---- conf/autoload_configs/voicemail.conf.xml 2010-06-22 17:19:31.000000000 -0400
-+++ conf/autoload_configs/voicemail.conf.xml 2010-06-29 11:10:26.000000000 -0400
-@@ -57,7 +57,7 @@
- <param name="date-fmt" value="%A, %B %d %Y, %I %M %p"/>
- <param name="email-from" value="${voicemail_account}@${voicemail_domain}"/>
- </email>
-- <!--<param name="storage-dir" value="/tmp"/>-->
-+ <!--<param name="voicemail-dir" value="/tmp"/>-->
- <!--<param name="odbc-dsn" value="dsn:user:pass"/>-->
- <!--<param name="record-comment" value="Your Comment"/>-->
- <!--<param name="record-title" value="Your Title"/>-->
Index: files/patch-configure.in
===================================================================
RCS file: /home/ncvs/ports/net/freeswitch-core/files/patch-configure.in,v
retrieving revision 1.2
diff -u -r1.2 patch-configure.in
--- files/patch-configure.in 8 Dec 2010 18:33:22 -0000 1.2
+++ files/patch-configure.in 3 Mar 2012 20:03:33 -0000
@@ -1,77 +1,176 @@
---- configure.in
-+++ configure.in
-@@ -38,12 +38,12 @@ AC_ARG_WITH([modinstdir],
- AC_SUBST(modulesdir)
- AC_DEFINE_UNQUOTED([SWITCH_MOD_DIR],"${modulesdir}",[where to install the modules to])
+--- configure.in.orig 2012-02-12 07:57:51.000000000 -0500
++++ configure.in 2012-02-12 09:37:03.000000000 -0500
+@@ -1,4 +1,4 @@
+-# -*- Autoconf -*-
++# -*- Autoconf -*-
+ # Process this file with autoconf to produce a configure script.
+
+ # Must change all of the below together
+@@ -32,75 +32,102 @@
+ AC_SUBST(switch_srcdir)
+ AC_SUBST(switch_builddir)
+
+-# Where to install the modules
+-AC_ARG_WITH([modinstdir],
+- [AS_HELP_STRING([--with-modinstdir=DIR], [Install modules into this location (default: $prefix/mod)])], [modulesdir="$withval"], [modulesdir="${prefix}/mod"])
+-AC_SUBST(modulesdir)
+-AC_DEFINE_UNQUOTED([SWITCH_MOD_DIR],"${modulesdir}",[where to install the modules to])
++#Where to put freeswitch config files
++if test "$sysconfdir" = "\${prefix}/etc" ; then
++ confdir="${prefix}/conf"
++else
++ confdir="${sysconfdir}"
++fi
--if test "$localstatedir" = "\${prefix}/var" ; then
++sysconfdir="$confdir"
++
++AC_SUBST(confdir)
++AC_DEFINE_UNQUOTED([SWITCH_CONF_DIR],"${confdir}",[directory for configuration files])
++
++#Where to put freswitch logfiles and runtime PID;
+ if test "$localstatedir" = "\${prefix}/var" ; then
- rundir="$prefix/run"
-+if test "${localstatedir}" = "\${prefix}/var" ; then
-+ rundir="${prefix}/run"
- logfiledir="${prefix}/log"
+- logdir="${prefix}/log"
++ rundir="${prefix}/run"
++ logdir="${prefix}/log"
else
- rundir="$localstatedir/run/freeswitch"
-- logfiledir="$localstatedir/log/freeswitch"
-+ rundir="${localstatedir}/run/freeswitch"
-+ logfiledir="${localstatedir}/log/freeswitch"
+- logdir="$localstatedir/log/freeswitch"
++ rundir="$localstatedir/run/freeswitch"
++ logdir="$localstatedir/log/freeswitch"
fi
- # Where to put pidfile
- AC_ARG_WITH([rundir],
-@@ -54,34 +54,34 @@ AC_DEFINE_UNQUOTED([SWITCH_RUN_DIR],"${runtimedir}",[where to put pidfile to])
- AC_SUBST(logfiledir)
- AC_DEFINE_UNQUOTED([SWITCH_LOG_DIR],"${logfiledir}",[where to put log files])
-
--dbdir="${prefix}/db"
-+dbdir="${localstatedir}/db/freeswitch"
- AC_SUBST(dbdir)
- AC_DEFINE_UNQUOTED([SWITCH_DB_DIR],"${dbdir}",[where to put db files])
-
--htdocsdir="${prefix}/htdocs"
-+htdocsdir="${prefix}/www/freeswitch/htdocs"
- AC_SUBST(htdocsdir)
- AC_DEFINE_UNQUOTED([SWITCH_HTDOCS_DIR],"${htdocsdir}",[where to put htdocs files])
-
--soundsdir="${prefix}/sounds"
-+soundsdir="${prefix}/share/freeswitch/sounds"
- AC_SUBST(soundsdir)
- AC_DEFINE_UNQUOTED([SWITCH_SOUNDS_DIR],"${soundsdir}",[where to put sounds files])
-
--grammardir="${prefix}/grammar"
-+grammardir="${prefix}/etc/freeswitch/grammar"
- AC_SUBST(grammardir)
- AC_DEFINE_UNQUOTED([SWITCH_GRAMMAR_DIR],"${grammardir}",[where to put grammar files])
-
--scriptdir="${prefix}/scripts"
-+scriptdir="${prefix}/etc/freeswitch/scripts"
- AC_SUBST(scriptdir)
- AC_DEFINE_UNQUOTED([SWITCH_SCRIPT_DIR],"${scriptdir}",[where to put script files])
-
--recordingsdir="${prefix}/recordings"
-+recordingsdir="${localstatedir}/freeswitch/recordings"
- AC_SUBST(recordingsdir)
- AC_DEFINE_UNQUOTED([SWITCH_RECORDINGS_DIR],"${recordingsdir}",[where to put recording files])
+-# Where to put pidfile
+-AC_ARG_WITH([rundir],
+- [AS_HELP_STRING([--with-rundir=DIR], [Put pidfile into this location (default: $prefix/run)])], [runtimedir="$withval"], [runtimedir="$rundir"])
+-AC_SUBST(runtimedir)
+-AC_DEFINE_UNQUOTED([SWITCH_RUN_DIR],"${runtimedir}",[where to put pidfile to])
+-
+-AC_ARG_WITH([logfiledir],
+- [AS_HELP_STRING([--with-logfiledir=DIR], [Put logfiles into this location (default: $localstatedir/log)])], [logfiledir="$withval"], [logfiledir="$logdir"])
+-AC_SUBST(logfiledir)
+-AC_DEFINE_UNQUOTED([SWITCH_LOG_DIR],"${logfiledir}",[where to put log files])
+
+-AC_ARG_WITH([dbdir],
+- [AS_HELP_STRING([--with-dbdir=DIR], [Put database files into this location (default: $prefix/db)])], [dbdir="$withval"], [dbdir="$prefix/db"])
+-AC_SUBST(dbdir)
+-AC_DEFINE_UNQUOTED([SWITCH_DB_DIR],"${dbdir}",[where to put db files])
++AC_SUBST(rundir)
++AC_DEFINE_UNQUOTED([SWITCH_RUN_DIR],"${rundir}",[where to putfreeswitch runtime pidfile to])
+
+-AC_ARG_WITH([htdocsdir],
+- [AS_HELP_STRING([--with-htdocsdir=DIR], [Put html files into this location (default: $prefix/htdocs)])], [htdocsdir="$withval"], [htdocsdir="$prefix/htdocs"])
+-AC_SUBST(htdocsdir)
+-AC_DEFINE_UNQUOTED([SWITCH_HTDOCS_DIR],"${htdocsdir}",[where to put htdocs files])
++AC_SUBST(logdir)
++AC_DEFINE_UNQUOTED([SWITCH_LOG_DIR],"${logdir}",[where to put freeswitch log files])
+
+-AC_ARG_WITH([soundsdir],
+- [AS_HELP_STRING([--with-soundsdir=DIR], [Put sound files into this location (default: $prefix/sounds)])], [soundsdir="$withval"], [soundsdir="$prefix/sounds"])
+-AC_SUBST(soundsdir)
+-AC_DEFINE_UNQUOTED([SWITCH_SOUNDS_DIR],"${soundsdir}",[where to put sounds files])
+
+-AC_ARG_WITH([grammardir],
+- [AS_HELP_STRING([--with-grammardir=DIR], [Put grammar files into this location (default: $prefix/grammar)])], [grammardir="$withval"], [grammardir="$prefix/grammar"])
+-AC_SUBST(grammardir)
+-AC_DEFINE_UNQUOTED([SWITCH_GRAMMAR_DIR],"${grammardir}",[where to put grammar files])
++#Where to put Freeswitch database;
++if test "$datadir" = "\${prefix}/var" ; then
++ dbdir="${prefix}/db"
++else
++ dbdir="${datadir}"
++fi
+
+-AC_ARG_WITH([scriptdir],
+- [AS_HELP_STRING([--with-scriptdir=DIR], [Put script files into this location (default: $prefix/scripts)])], [scriptdir="$withval"], [scriptdir="$prefix/scripts"])
+-AC_SUBST(scriptdir)
+-AC_DEFINE_UNQUOTED([SWITCH_SCRIPT_DIR],"${scriptdir}",[where to put script files])
++datadir="$dbdir"
+
+-AC_ARG_WITH([recordingsdir],
+- [AS_HELP_STRING([--with-recordingsdir=DIR], [Put recordings files into this location (default: $prefix/recordings)])], [recordingsdir="$withval"], [recordingsdir="$prefix/recordings"])
+-AC_SUBST(recordingsdir)
+-AC_DEFINE_UNQUOTED([SWITCH_RECORDINGS_DIR],"${recordingsdir}",[where to put recording files])
++AC_SUBST(dbdir)
++AC_DEFINE_UNQUOTED([SWITCH_DB_DIR],"${dbdir}",[where to store freeswitch database files])
++
++#Where to put grammar files
++AC_ARG_WITH([grammardir],
++ [AS_HELP_STRING([--with-grammardir=DIR], [Put grammar files into this location (default: $prefix/grammar)])], [grammardir="$withval"], [grammardir="${prefix}/grammar"])
++AC_SUBST(grammardir)
++AC_DEFINE_UNQUOTED([SWITCH_GRAMMAR_DIR],"${grammardir}",[where to put freeswitch grammar files])
++#Where to put freeswitch htdoc files
if test "$sysconfdir" = "\${prefix}/etc" ; then
- confdir="$prefix/conf"
-+ confdir="${prefix}/conf"
++ htdocsdir="${prefix}/htdocs"
else
- confdir="$sysconfdir"
-+ confdir="${sysconfdir}"
++ htdocsdir="${htmldir}"
fi
- sysconfdir="$confdir"
-@@ -89,6 +89,14 @@ sysconfdir="$confdir"
- AC_SUBST(confdir)
- AC_DEFINE_UNQUOTED([SWITCH_CONF_DIR],"${confdir}",[directory for configuration files])
+-sysconfdir="$confdir"
++htmldir="$htdocdir"
-+storagedir="${localstatedir}/freeswitch"
+-AC_SUBST(confdir)
+-AC_DEFINE_UNQUOTED([SWITCH_CONF_DIR],"${confdir}",[directory for configuration files])
++AC_SUBST(htdocsdir)
++AC_DEFINE_UNQUOTED([SWITCH_HTDOCS_DIR],"${htdocsdir}",[where to put freeswitch htdocs files])
+
+-AC_SUBST(libdir)
+-AC_SUBST(bindir)
+-AC_SUBST(includedir)
++# Where to install the modules
++AC_ARG_WITH([modinstdir],
++ [AS_HELP_STRING([--with-modinstdir=DIR], [Install modules into this location (default: $prefix/mod)])], [modulesdir="$withval"], [modulesdir="${prefix}/mod"])
++AC_SUBST(modulesdir)
++AC_DEFINE_UNQUOTED([SWITCH_MOD_DIR],"${modulesdir}",[where to install the modules to])
++
++#Where to put Custom Recordings
++AC_ARG_WITH([recordingsdir],
++ [AS_HELP_STRING([--with-recordingsdir=DIR], [Put recordings files into this location (default: $prefix/recordings)])], [recordingsdir="$withval"], [recordingsdir="${PREFIX}/recordings"])
++AC_SUBST(recordingsdir)
++AC_DEFINE_UNQUOTED([SWITCH_RECORDINGS_DIR],"${recordingsdir}",[where to putfreeswitch custom recording files])
+
++#Where to put custom scripts
++AC_ARG_WITH([scriptdir],
++ [AS_HELP_STRING([--with-scriptdir=DIR], [Put script files into this location (default: $prefix/scripts)])], [scriptdir="$withval"], [scriptdir="${prefix}/scripts"])
++AC_SUBST(scriptdir)
++AC_DEFINE_UNQUOTED([SWITCH_SCRIPT_DIR],"${scriptdir}",[where to put freeswitch & custom script files])
++
++#Where to put freeswitch sounds and moh
++AC_ARG_WITH([soundsdir],
++ [AS_HELP_STRING([--with-soundsdir=DIR], [Put freeswitch sound files into this location (default: $prefix/sounds)])], [soundsdir="$withval"],
++[soundsdir="${prefix}/sounds"])
++AC_SUBST(soundsdir)
++AC_DEFINE_UNQUOTED([SWITCH_SOUNDS_DIR],"${soundsdir}",[where to put freeswitch sounds files])
++
++#Freeswitch dir for storage.
++AC_ARG_WITH([storagedir],
++ [AS_HELP_STRING([--with-storagedir=DIR], [Store files in this location (default: $prefix/storage)])], [storagedir="$withval"], [storagedir="${prefix}/storage"])
+AC_SUBST(storagedir)
-+AC_DEFINE_UNQUOTED([SWITCH_STORAGE_DIR],"${storagedir}",[where to put extra files])
++AC_DEFINE_UNQUOTED([SWITCH_STORAGE_DIR],"${storagedir}",[where to put extra files & faxes])
+
-+voicemaildir="${localstatedir}/spool/freeswitch/voicemail"
++#Where to put voicemail spool
++AC_ARG_WITH([voicemaildir],
++ [AS_HELP_STRING([--with-voicemaildir=DIR], [Put recordings files into this location (default: $prefix/storage/voicemail)])], [voicemaildir="$withval"], [voicemaildir="${PREFIX}/storage/voicemail"])
+AC_SUBST(voicemaildir)
-+AC_DEFINE_UNQUOTED([SWITCH_VOICEMAIL_DIR],"${voicemaildir}",[where to put voicemail])
++AC_DEFINE_UNQUOTED([SWITCH_VOICEMAIL_DIR],"${voicemaildir}",[where to put freeswitch voicemail spool])
++
++#Where to put pkgconfig file
+ AC_ARG_WITH([pkgconfigdir],
+ [AS_HELP_STRING([--with-pkgconfigdir=DIR], [Installation directory for pkgconfig file (default: ${libdir}/pkgconfig)])],
+ [case "${withval}" in
+@@ -112,6 +139,13 @@
+ )
+ AC_SUBST([pkgconfigdir])
+
++AC_SUBST(confdir)
++AC_DEFINE_UNQUOTED([SWITCH_CONF_DIR],"${confdir}",[directory for configuration files])
++
++AC_SUBST(libdir)
++AC_SUBST(bindir)
++AC_SUBST(includedir)
+
- AC_SUBST(libdir)
- AC_SUBST(bindir)
- AC_SUBST(includedir)
+ #Set default language
+ AC_LANG_C
+ # Checks for programs.
Index: files/patch-libs-freetdm-mod_freetdm-Makefile.in
===================================================================
RCS file: /home/ncvs/ports/net/freeswitch-core/files/patch-libs-freetdm-mod_freetdm-Makefile.in,v
retrieving revision 1.2
diff -u -r1.2 patch-libs-freetdm-mod_freetdm-Makefile.in
--- files/patch-libs-freetdm-mod_freetdm-Makefile.in 28 Oct 2011 21:56:51 -0000 1.2
+++ files/patch-libs-freetdm-mod_freetdm-Makefile.in 3 Mar 2012 20:03:33 -0000
@@ -6,7 +6,7 @@
cd $(FT_DIR) && $(MAKE) install
- [ -f $(DESTDIR)@confdir@/autoload_configs/freetdm.conf.xml ] || cp -f $(FT_DIR)/conf/freetdm.conf.xml $(DESTDIR)@confdir@/autoload_configs
-
-+ @for i in $(FT_DIR)/conf/*.xml; do cp -p $$i $$i.sample; done; cp -f -p $(FT_DIR)/conf/*.xml.sample $(DESTDIR)@confdir@/autoload_configs
++ @for i in $(FT_DIR)/conf/*.xml; do cp -p $$i $$i.sample; done; [ -f $(DESTDIR)@confdir@/autoload_configs/freetdm.conf.xml.sample ] || cp -f -p $(FT_DIR)/conf/freetdm.conf.xml.sample $(DESTDIR)@confdir@/autoload_configs
local_clean:
cd $(FT_DIR) && $(MAKE) clean
Index: files/patch-src-mod-applications-mod_ladspa-mod_ladspa.c
===================================================================
RCS file: files/patch-src-mod-applications-mod_ladspa-mod_ladspa.c
diff -N files/patch-src-mod-applications-mod_ladspa-mod_ladspa.c
--- files/patch-src-mod-applications-mod_ladspa-mod_ladspa.c 28 Oct 2011 21:56:51 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
---- src/mod/applications/mod_ladspa/mod_ladspa.c.orig 2011-07-05 22:23:14.000000000 -0400
-+++ src/mod/applications/mod_ladspa/mod_ladspa.c 2011-07-05 22:24:32.000000000 -0400
-@@ -634,6 +634,8 @@
- setenv("LADSPA_PATH", "/usr/lib64/ladspa/:/usr/local/lib/ladspa", 1);
- } else if (switch_directory_exists("/usr/lib/ladspa/", pool) == SWITCH_STATUS_SUCCESS) {
- setenv("LADSPA_PATH", "/usr/lib/ladspa/:/usr/local/lib/ladspa", 1);
-+ } else if (switch_directory_exists("/usr/local/lib/ladspa/", pool) == SWITCH_STATUS_SUCCESS) {
-+ putenv("LADSPA_PATH=/usr/local/lib/ladspa");
- }
- }
-
Index: files/patch-src-mod-applications-mod_voicemail-mod_voicemail.c
===================================================================
RCS file: files/patch-src-mod-applications-mod_voicemail-mod_voicemail.c
diff -N files/patch-src-mod-applications-mod_voicemail-mod_voicemail.c
--- files/patch-src-mod-applications-mod_voicemail-mod_voicemail.c 16 Jul 2010 14:57:42 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,127 +0,0 @@
---- src/mod/applications/mod_voicemail/mod_voicemail.c 2010-06-22 17:19:34.000000000 -0400
-+++ src/mod/applications/mod_voicemail/mod_voicemail.c 2010-07-02 13:03:12.000000000 -0400
-@@ -119,7 +119,7 @@
- char *operator_ext;
- char *vmain_ext;
- char *tone_spec;
-- char *storage_dir;
-+ char *voicemail_dir;
- char *callback_dialplan;
- char *callback_context;
- char *email_body;
-@@ -539,8 +539,8 @@
-
- SWITCH_CONFIG_SET_ITEM(profile->config[i++], "tone-spec", SWITCH_CONFIG_STRING, CONFIG_RELOADABLE,
- &profile->tone_spec, "%(1000, 0, 640)", &profile->config_str_pool, NULL, NULL);
-- SWITCH_CONFIG_SET_ITEM(profile->config[i++], "storage-dir", SWITCH_CONFIG_STRING, CONFIG_RELOADABLE,
-- &profile->storage_dir, "", &profile->config_str_pool, NULL, NULL);
-+ SWITCH_CONFIG_SET_ITEM(profile->config[i++], "voicemail-dir", SWITCH_CONFIG_STRING, CONFIG_RELOADABLE,
-+ &profile->voicemail_dir, "", &profile->config_str_pool, NULL, NULL);
- SWITCH_CONFIG_SET_ITEM(profile->config[i++], "callback-dialplan", SWITCH_CONFIG_STRING, CONFIG_RELOADABLE,
- &profile->callback_dialplan, "XML", &profile->config_str_pool, NULL, NULL);
- SWITCH_CONFIG_SET_ITEM(profile->config[i++], "callback-context", SWITCH_CONFIG_STRING, CONFIG_RELOADABLE,
-@@ -1706,7 +1706,7 @@
- char *vm_email = NULL, *email_addr = NULL;
- char *convert_cmd = profile->convert_cmd;
- char *convert_ext = profile->convert_ext;
-- char *vm_storage_dir = NULL;
-+ char *vm_voicemail_dir = NULL;
- char global_buf[2] = "";
- switch_input_args_t args = { 0 };
- const char *caller_id_name = NULL;
-@@ -2149,8 +2149,8 @@
- convert_cmd = switch_core_session_strdup(session, val);
- } else if (!strcasecmp(var, "vm-convert-ext")) {
- convert_ext = switch_core_session_strdup(session, val);
-- } else if (!strcasecmp(var, "storage-dir")) {
-- vm_storage_dir = switch_core_session_strdup(session, val);
-+ } else if (!strcasecmp(var, "voicemail-dir")) {
-+ vm_voicemail_dir = switch_core_session_strdup(session, val);
-
- } else if (!strcasecmp(var, "timezone")) {
- switch_channel_set_variable(channel, var, val);
-@@ -2211,14 +2211,14 @@
-
- if (auth) {
- if (!dir_path) {
-- if (!zstr(vm_storage_dir)) {
-- dir_path = switch_core_session_sprintf(session, "%s%s%s", vm_storage_dir, SWITCH_PATH_SEPARATOR, myid);
-- } else if (!zstr(profile->storage_dir)) {
-+ if (!zstr(vm_voicemail_dir)) {
-+ dir_path = switch_core_session_sprintf(session, "%s%s%s", vm_voicemail_dir, SWITCH_PATH_SEPARATOR, myid);
-+ } else if (!zstr(profile->voicemail_dir)) {
- dir_path =
-- switch_core_session_sprintf(session, "%s%s%s%s%s", profile->storage_dir, SWITCH_PATH_SEPARATOR, domain_name,
-+ switch_core_session_sprintf(session, "%s%s%s%s%s", profile->voicemail_dir, SWITCH_PATH_SEPARATOR, domain_name,
- SWITCH_PATH_SEPARATOR, myid);
- } else {
-- dir_path = switch_core_session_sprintf(session, "%s%svoicemail%s%s%s%s%s%s", SWITCH_GLOBAL_dirs.storage_dir,
-+ dir_path = switch_core_session_sprintf(session, "%s%s%s%s%s%s%s%s", SWITCH_GLOBAL_dirs.voicemail_dir,
- SWITCH_PATH_SEPARATOR,
- SWITCH_PATH_SEPARATOR,
- profile->name, SWITCH_PATH_SEPARATOR, domain_name, SWITCH_PATH_SEPARATOR, myid);
-@@ -2293,7 +2293,7 @@
- int send_notify = 0;
- int insert_db = 1;
- int email_attach = 0;
-- char *vm_storage_dir = NULL;
-+ char *vm_voicemail_dir = NULL;
- char *myfolder = "inbox";
- int priority = 3;
- const char *tmp;
-@@ -2366,12 +2366,12 @@
-
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Deliver VM to %s@%s\n", myid, domain_name);
-
-- if (!zstr(vm_storage_dir)) {
-- dir_path = switch_mprintf("%s%s%s", vm_storage_dir, SWITCH_PATH_SEPARATOR, myid);
-- } else if (!zstr(profile->storage_dir)) {
-- dir_path = switch_mprintf("%s%s%s%s%s", profile->storage_dir, SWITCH_PATH_SEPARATOR, domain_name, SWITCH_PATH_SEPARATOR, myid);
-+ if (!zstr(vm_voicemail_dir)) {
-+ dir_path = switch_mprintf("%s%s%s", vm_voicemail_dir, SWITCH_PATH_SEPARATOR, myid);
-+ } else if (!zstr(profile->voicemail_dir)) {
-+ dir_path = switch_mprintf("%s%s%s%s%s", profile->voicemail_dir, SWITCH_PATH_SEPARATOR, domain_name, SWITCH_PATH_SEPARATOR, myid);
- } else {
-- dir_path = switch_mprintf("%s%svoicemail%s%s%s%s%s%s", SWITCH_GLOBAL_dirs.storage_dir,
-+ dir_path = switch_mprintf("%s%s%s%s%s%s%s%s", SWITCH_GLOBAL_dirs.voicemail_dir,
- SWITCH_PATH_SEPARATOR,
- SWITCH_PATH_SEPARATOR, profile->name, SWITCH_PATH_SEPARATOR, domain_name, SWITCH_PATH_SEPARATOR, myid);
- }
-@@ -2822,7 +2822,7 @@
- char date[80] = "";
- switch_size_t retsize;
- switch_time_t ts = switch_micro_time_now();
-- char *vm_storage_dir = NULL;
-+ char *vm_voicemail_dir = NULL;
- char *record_macro = VM_RECORD_MESSAGE_MACRO;
- int send_main = 0;
- int send_notify = 0;
-@@ -2876,8 +2876,8 @@
- email_addr = switch_core_session_strdup(session, val);
- } else if (!strcasecmp(var, "vm-email-all-messages") && (send_main = switch_true(val))) {
- send_mail++;
-- } else if (!strcasecmp(var, "storage-dir")) {
-- vm_storage_dir = switch_core_session_strdup(session, val);
-+ } else if (!strcasecmp(var, "voicemail-dir")) {
-+ vm_voicemail_dir = switch_core_session_strdup(session, val);
- } else if (!strcasecmp(var, "vm-notify-email-all-messages") && (send_notify = switch_true(val))) {
- send_mail++;
- } else if (!strcasecmp(var, "vm-keep-local-after-email")) {
-@@ -2933,12 +2933,12 @@
- }
- }
-
-- if (!zstr(vm_storage_dir)) {
-- dir_path = switch_core_session_sprintf(session, "%s%s%s", vm_storage_dir, SWITCH_PATH_SEPARATOR, id);
-- } else if (!zstr(profile->storage_dir)) {
-- dir_path = switch_core_session_sprintf(session, "%s%s%s%s%s", profile->storage_dir, SWITCH_PATH_SEPARATOR, domain_name, SWITCH_PATH_SEPARATOR, id);
-+ if (!zstr(vm_voicemail_dir)) {
-+ dir_path = switch_core_session_sprintf(session, "%s%s%s", vm_voicemail_dir, SWITCH_PATH_SEPARATOR, id);
-+ } else if (!zstr(profile->voicemail_dir)) {
-+ dir_path = switch_core_session_sprintf(session, "%s%s%s%s%s", profile->voicemail_dir, SWITCH_PATH_SEPARATOR, domain_name, SWITCH_PATH_SEPARATOR, id);
- } else {
-- dir_path = switch_core_session_sprintf(session, "%s%svoicemail%s%s%s%s%s%s", SWITCH_GLOBAL_dirs.storage_dir,
-+ dir_path = switch_core_session_sprintf(session, "%s%s%s%s%s%s%s%s", SWITCH_GLOBAL_dirs.voicemail_dir,
- SWITCH_PATH_SEPARATOR,
- SWITCH_PATH_SEPARATOR, profile->name, SWITCH_PATH_SEPARATOR, domain_name, SWITCH_PATH_SEPARATOR, id);
- }
Index: files/patch-src-mod-loggers-mod_logfile-mod_logfile.c
===================================================================
RCS file: files/patch-src-mod-loggers-mod_logfile-mod_logfile.c
diff -N files/patch-src-mod-loggers-mod_logfile-mod_logfile.c
--- files/patch-src-mod-loggers-mod_logfile-mod_logfile.c 28 Oct 2011 21:56:51 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
---- src/mod/loggers/mod_logfile/mod_logfile.c.orig 2011-02-02 11:08:44.000000000 -0500
-+++ src/mod/loggers/mod_logfile/mod_logfile.c 2011-02-02 11:09:38.000000000 -0500
-@@ -94,7 +94,7 @@
- flags |= SWITCH_FOPEN_WRITE;
- flags |= SWITCH_FOPEN_APPEND;
-
-- stat = switch_file_open(&afd, profile->logfile, flags, SWITCH_FPROT_UREAD | SWITCH_FPROT_UWRITE | SWITCH_FPROT_WREAD, module_pool);
-+ stat = switch_file_open(&afd, profile->logfile, flags, SWITCH_FPROT_UREAD | SWITCH_FPROT_UWRITE | SWITCH_FPROT_GREAD | SWITCH_FPROT_WREAD, module_pool);
- if (stat != SWITCH_STATUS_SUCCESS) {
- return SWITCH_STATUS_FALSE;
- }
Index: files/pkg-install.in
===================================================================
RCS file: /home/ncvs/ports/net/freeswitch-core/files/pkg-install.in,v
retrieving revision 1.4
diff -u -r1.4 pkg-install.in
--- files/pkg-install.in 28 Oct 2011 21:56:51 -0000 1.4
+++ files/pkg-install.in 3 Mar 2012 20:03:33 -0000
@@ -17,7 +17,9 @@
do chown %%FREESWITCH_USER%%:%%FREESWITCH_GROUP%% ${PKG_PREFIX}/$dir
done
-find ${PKG_PREFIX}/etc/freeswitch/ -type d -exec chmod 755 {} +
+find ${PKG_PREFIX}/etc/freeswitch/ -type d -exec chmod 775 {} +
+find ${PKG_PREFIX}/etc/freeswitch/ -type f -exec chmod 664 {} +
+
chmod 775 ${PKG_PREFIX}/share/freeswitch
# @cwd /var
@@ -32,6 +34,7 @@
echo "This port chown -R various directories %%FREESWITCH_USER%%:%%FREESWITCH_GROUP%%"
echo "This port chmod -R 775 various directories"
+echo" This port chmod -R 644 various files"
echo "This is for security reasons. In the event something should"
echo "stop working, please take the time to check the following dirs:"
echo "/var/spool/freeswitch /var/log/freeswitch /var/freeswitch"
--------------030407060206080908020907--
More information about the freebsd-ports-bugs
mailing list