diff options
| author | jnemeth <jnemeth@pkgsrc.org> | 2011-10-12 03:21:07 +0000 |
|---|---|---|
| committer | jnemeth <jnemeth@pkgsrc.org> | 2011-10-12 03:21:07 +0000 |
| commit | 148b3440d240eaf7da171a2e70496e5572ed94ba (patch) | |
| tree | c749bf4f2c4e1d271b059291f5dbcb38273388bb /comms | |
| parent | e11e34c259fcf796069bcfdddde35738646b0f4f (diff) | |
| download | pkgsrc-148b3440d240eaf7da171a2e70496e5572ed94ba.tar.gz | |
Update to 1.8.7.0nb1.
This update adds a "jabber" option which is enabled by default.
This option pulls in iksemel which is used by the res_jabber.
Doing this allows chan_jingle (jabber) and chan_gtalk to work.
Diffstat (limited to 'comms')
| -rw-r--r-- | comms/asterisk18/Makefile | 3 | ||||
| -rw-r--r-- | comms/asterisk18/PLIST | 5 | ||||
| -rw-r--r-- | comms/asterisk18/options.mk | 15 |
3 files changed, 18 insertions, 5 deletions
diff --git a/comms/asterisk18/Makefile b/comms/asterisk18/Makefile index 0777873bc63..4b1e70076b1 100644 --- a/comms/asterisk18/Makefile +++ b/comms/asterisk18/Makefile @@ -1,9 +1,10 @@ -# $NetBSD: Makefile,v 1.13 2011/10/11 03:12:55 jnemeth Exp $ +# $NetBSD: Makefile,v 1.14 2011/10/12 03:21:07 jnemeth Exp $ # # NOTE: when updating this package, there are two places that sound # tarballs need to be checked DISTNAME= asterisk-1.8.7.0 +PKGREVISION= 1 DIST_SUBDIR= ${PKGNAME_NOREV} DISTFILES= ${DEFAULT_DISTFILES} EXTRACT_ONLY= ${DISTNAME}.tar.gz diff --git a/comms/asterisk18/PLIST b/comms/asterisk18/PLIST index b2fae38b0c6..2c0ef70401f 100644 --- a/comms/asterisk18/PLIST +++ b/comms/asterisk18/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2011/10/11 03:12:55 jnemeth Exp $ +@comment $NetBSD: PLIST,v 1.8 2011/10/12 03:21:07 jnemeth Exp $ include/asterisk.h include/asterisk/_private.h include/asterisk/abstract_jb.h @@ -217,7 +217,9 @@ lib/asterisk/modules/cel_manager.so ${PLIST.unixodbc}lib/asterisk/modules/cel_odbc.so lib/asterisk/modules/chan_agent.so lib/asterisk/modules/chan_bridge.so +${PLIST.jabber}lib/asterisk/modules/chan_gtalk.so lib/asterisk/modules/chan_iax2.so +${PLIST.jabber}lib/asterisk/modules/chan_jingle.so lib/asterisk/modules/chan_local.so lib/asterisk/modules/chan_mgcp.so lib/asterisk/modules/chan_multicast_rtp.so @@ -313,6 +315,7 @@ lib/asterisk/modules/res_crypto.so lib/asterisk/modules/res_curl.so lib/asterisk/modules/res_fax.so ${PLIST.spandsp}lib/asterisk/modules/res_fax_spandsp.so +${PLIST.jabber}lib/asterisk/modules/res_jabber.so lib/asterisk/modules/res_limit.so lib/asterisk/modules/res_monitor.so lib/asterisk/modules/res_musiconhold.so diff --git a/comms/asterisk18/options.mk b/comms/asterisk18/options.mk index dc497e03bfe..9deeaa62085 100644 --- a/comms/asterisk18/options.mk +++ b/comms/asterisk18/options.mk @@ -1,13 +1,14 @@ -# $NetBSD: options.mk,v 1.6 2011/10/11 03:12:55 jnemeth Exp $ +# $NetBSD: options.mk,v 1.7 2011/10/12 03:21:07 jnemeth Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.asterisk PKG_SUPPORTED_OPTIONS= zaptel x11 unixodbc ilbc webvmail ldap spandsp +PKG_SUPPORTED_OPTIONS+= jabber PKG_OPTIONS_LEGACY_OPTS+= gtk:x11 -PKG_SUGGESTED_OPTIONS= ldap +PKG_SUGGESTED_OPTIONS= ldap jabber .include "../../mk/bsd.options.mk" -PLIST_VARS+= zaptel x11 unixodbc ilbc webvmail ldap spandsp +PLIST_VARS+= zaptel x11 unixodbc ilbc webvmail ldap spandsp jabber # Asterisk now uses DAHDI, not zaptel; not implemented yet... #.if !empty(PKG_OPTIONS:Mzaptel) @@ -58,6 +59,14 @@ PLIST.spandsp= yes CONFIGURE_ARGS+= --without-spandsp .endif +.if !empty(PKG_OPTIONS:Mjabber) +. include "../../textproc/iksemel/buildlink3.mk" +CONFIGURE_ARGS+= --with-iksemel=${PREFIX} +PLIST.jabber= yes +.else +CONFIGURE_ARGS+= --without-iksemel +.endif + MAKE_FLAGS+= GLOBAL_MAKEOPTS=${WRKSRC}/pkgsrc.makeopts post-configure: .if !empty(PKG_OPTIONS:Mx11) |