Sun Feb 6 08:30:17 2011 UTC ()
Add a spandsp option which pulls in comms/spandsp and links against it
to enable res_fax_spandsp.so.  Don't bother with a PKGREVISION bump since
this doesn't change default builds and there is no need tobother people
that don't need the option.


(jnemeth)
diff -r1.2 -r1.3 pkgsrc/comms/asterisk18/PLIST
diff -r1.1.1.1 -r1.2 pkgsrc/comms/asterisk18/options.mk
cvs diff -r1.2 -r1.3 pkgsrc/comms/asterisk18/PLIST (expand / switch to unified diff)

--- pkgsrc/comms/asterisk18/PLIST 2010/12/20 04:06:16 1.2
+++ pkgsrc/comms/asterisk18/PLIST 2011/02/06 08:30:17 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.2 2010/12/20 04:06:16 jnemeth Exp $ 1@comment $NetBSD: PLIST,v 1.3 2011/02/06 08:30:17 jnemeth Exp $
2include/asterisk.h 2include/asterisk.h
3include/asterisk/_private.h 3include/asterisk/_private.h
4include/asterisk/abstract_jb.h 4include/asterisk/abstract_jb.h
5include/asterisk/acl.h 5include/asterisk/acl.h
6include/asterisk/adsi.h 6include/asterisk/adsi.h
7include/asterisk/ael_structs.h 7include/asterisk/ael_structs.h
8include/asterisk/agi.h 8include/asterisk/agi.h
9include/asterisk/alaw.h 9include/asterisk/alaw.h
10include/asterisk/aoc.h 10include/asterisk/aoc.h
11include/asterisk/app.h 11include/asterisk/app.h
12include/asterisk/ast_expr.h 12include/asterisk/ast_expr.h
13include/asterisk/ast_version.h 13include/asterisk/ast_version.h
14include/asterisk/astdb.h 14include/asterisk/astdb.h
@@ -302,26 +302,27 @@ lib/asterisk/modules/pbx_spool.so @@ -302,26 +302,27 @@ lib/asterisk/modules/pbx_spool.so
302lib/asterisk/modules/res_adsi.so 302lib/asterisk/modules/res_adsi.so
303lib/asterisk/modules/res_ael_share.so 303lib/asterisk/modules/res_ael_share.so
304lib/asterisk/modules/res_agi.so 304lib/asterisk/modules/res_agi.so
305lib/asterisk/modules/res_calendar.so 305lib/asterisk/modules/res_calendar.so
306lib/asterisk/modules/res_clialiases.so 306lib/asterisk/modules/res_clialiases.so
307lib/asterisk/modules/res_clioriginate.so 307lib/asterisk/modules/res_clioriginate.so
308lib/asterisk/modules/res_config_curl.so 308lib/asterisk/modules/res_config_curl.so
309${PLIST.ldap}lib/asterisk/modules/res_config_ldap.so 309${PLIST.ldap}lib/asterisk/modules/res_config_ldap.so
310${PLIST.unixodbc}lib/asterisk/modules/res_config_odbc.so 310${PLIST.unixodbc}lib/asterisk/modules/res_config_odbc.so
311lib/asterisk/modules/res_convert.so 311lib/asterisk/modules/res_convert.so
312lib/asterisk/modules/res_crypto.so 312lib/asterisk/modules/res_crypto.so
313lib/asterisk/modules/res_curl.so 313lib/asterisk/modules/res_curl.so
314lib/asterisk/modules/res_fax.so 314lib/asterisk/modules/res_fax.so
 315${PLIST.spandsp}lib/asterisk/modules/res_fax_spandsp.so
315lib/asterisk/modules/res_limit.so 316lib/asterisk/modules/res_limit.so
316lib/asterisk/modules/res_monitor.so 317lib/asterisk/modules/res_monitor.so
317lib/asterisk/modules/res_musiconhold.so 318lib/asterisk/modules/res_musiconhold.so
318lib/asterisk/modules/res_mutestream.so 319lib/asterisk/modules/res_mutestream.so
319${PLIST.unixodbc}lib/asterisk/modules/res_odbc.so 320${PLIST.unixodbc}lib/asterisk/modules/res_odbc.so
320lib/asterisk/modules/res_phoneprov.so 321lib/asterisk/modules/res_phoneprov.so
321lib/asterisk/modules/res_realtime.so 322lib/asterisk/modules/res_realtime.so
322lib/asterisk/modules/res_rtp_asterisk.so 323lib/asterisk/modules/res_rtp_asterisk.so
323lib/asterisk/modules/res_rtp_multicast.so 324lib/asterisk/modules/res_rtp_multicast.so
324lib/asterisk/modules/res_security_log.so 325lib/asterisk/modules/res_security_log.so
325lib/asterisk/modules/res_smdi.so 326lib/asterisk/modules/res_smdi.so
326lib/asterisk/modules/res_speech.so 327lib/asterisk/modules/res_speech.so
327lib/asterisk/modules/res_stun_monitor.so 328lib/asterisk/modules/res_stun_monitor.so
cvs diff -r1.1.1.1 -r1.2 pkgsrc/comms/asterisk18/options.mk (expand / switch to unified diff)

--- pkgsrc/comms/asterisk18/options.mk 2010/12/15 03:22:45 1.1.1.1
+++ pkgsrc/comms/asterisk18/options.mk 2011/02/06 08:30:17 1.2
@@ -1,23 +1,23 @@ @@ -1,23 +1,23 @@
1# $NetBSD: options.mk,v 1.1.1.1 2010/12/15 03:22:45 jnemeth Exp $ 1# $NetBSD: options.mk,v 1.2 2011/02/06 08:30:17 jnemeth Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.asterisk 3PKG_OPTIONS_VAR= PKG_OPTIONS.asterisk
4PKG_SUPPORTED_OPTIONS= zaptel x11 unixodbc ilbc webvmail ldap 4PKG_SUPPORTED_OPTIONS= zaptel x11 unixodbc ilbc webvmail ldap spandsp
5PKG_OPTIONS_LEGACY_OPTS+= gtk:x11 5PKG_OPTIONS_LEGACY_OPTS+= gtk:x11
6PKG_SUGGESTED_OPTIONS= ldap 6PKG_SUGGESTED_OPTIONS= ldap
7 7
8.include "../../mk/bsd.options.mk" 8.include "../../mk/bsd.options.mk"
9 9
10PLIST_VARS+= zaptel x11 unixodbc ilbc webvmail ldap 10PLIST_VARS+= zaptel x11 unixodbc ilbc webvmail ldap spandsp
11 11
12# Asterisk now uses DAHDI, not zaptel; not implemented yet... 12# Asterisk now uses DAHDI, not zaptel; not implemented yet...
13#.if !empty(PKG_OPTIONS:Mzaptel) 13#.if !empty(PKG_OPTIONS:Mzaptel)
14## zaptel only supported under NetBSD at the moment 14## zaptel only supported under NetBSD at the moment
15#. include "../../comms/zaptel-netbsd/buildlink3.mk" 15#. include "../../comms/zaptel-netbsd/buildlink3.mk"
16#PLIST.zaptel= yes 16#PLIST.zaptel= yes
17#.else 17#.else
18#MAKE_FLAGS+= WITHOUT_ZAPTEL=1 18#MAKE_FLAGS+= WITHOUT_ZAPTEL=1
19#.endif 19#.endif
20 20
21# gtkconsole depends on GTK 1.x 21# gtkconsole depends on GTK 1.x
22.if !empty(PKG_OPTIONS:Mx11) 22.if !empty(PKG_OPTIONS:Mx11)
23. include "../../x11/gtk/buildlink3.mk" 23. include "../../x11/gtk/buildlink3.mk"
@@ -40,26 +40,34 @@ PLIST.unixodbc= yes @@ -40,26 +40,34 @@ PLIST.unixodbc= yes
40CONFIGURE_ARGS+= --without-ltdl 40CONFIGURE_ARGS+= --without-ltdl
41CONFIGURE_ARGS+= --without-odbc 41CONFIGURE_ARGS+= --without-odbc
42.endif 42.endif
43 43
44.if !empty(PKG_OPTIONS:Milbc) 44.if !empty(PKG_OPTIONS:Milbc)
45DISTFILES+= rfc3951.txt 45DISTFILES+= rfc3951.txt
46SITES.rfc3951.txt= http://www.ietf.org/rfc/ 46SITES.rfc3951.txt= http://www.ietf.org/rfc/
47DISTFILES+= extract-cfile.awk 47DISTFILES+= extract-cfile.awk
48SITES.extract-cfile.awk= http://www.ilbcfreeware.org/documentation/ 48SITES.extract-cfile.awk= http://www.ilbcfreeware.org/documentation/
49USE_TOOLS+= awk 49USE_TOOLS+= awk
50PLIST.ilbc= yes 50PLIST.ilbc= yes
51.endif 51.endif
52 52
 53.if !empty(PKG_OPTIONS:Mspandsp)
 54. include "../../comms/spandsp/buildlink3.mk"
 55CONFIGURE_ARGS+= --with-spandsp
 56PLIST.spandsp= yes
 57.else
 58CONFIGURE_ARGS+= --without-spandsp
 59.endif
 60
53MAKE_FLAGS+= GLOBAL_MAKEOPTS=${WRKSRC}/pkgsrc.makeopts 61MAKE_FLAGS+= GLOBAL_MAKEOPTS=${WRKSRC}/pkgsrc.makeopts
54post-configure: 62post-configure:
55.if !empty(PKG_OPTIONS:Mx11) 63.if !empty(PKG_OPTIONS:Mx11)
56 ${ECHO} "MENUSELECT_PBX=-pbx_gtkconsole" >> ${WRKSRC}/pkgsrc.makeopts 64 ${ECHO} "MENUSELECT_PBX=-pbx_gtkconsole" >> ${WRKSRC}/pkgsrc.makeopts
57.endif 65.endif
58.if !empty(PKG_OPTIONS:Munixodbc) 66.if !empty(PKG_OPTIONS:Munixodbc)
59 ${ECHO} "MENUSELECT_OPTS_app_voicemail=ODBC_STORAGE" >> ${WRKSRC}/pkgsrc.makeopts 67 ${ECHO} "MENUSELECT_OPTS_app_voicemail=ODBC_STORAGE" >> ${WRKSRC}/pkgsrc.makeopts
60.endif 68.endif
61.if !empty(PKG_OPTIONS:Milbc) 69.if !empty(PKG_OPTIONS:Milbc)
62 ${ECHO} "MENUSELECT_CODECS=-codec_ilbc" >> ${WRKSRC}/pkgsrc.makeopts 70 ${ECHO} "MENUSELECT_CODECS=-codec_ilbc" >> ${WRKSRC}/pkgsrc.makeopts
63.endif 71.endif
64 # this is a hack to work around a bug in menuselect 72 # this is a hack to work around a bug in menuselect
65 ${ECHO} "MENUSELECT_AGIS=agi-test.agi eagi-test eagi-sphinx-test jukebox.agi" >> ${WRKSRC}/pkgsrc.makeopts 73 ${ECHO} "MENUSELECT_AGIS=agi-test.agi eagi-test eagi-sphinx-test jukebox.agi" >> ${WRKSRC}/pkgsrc.makeopts