Here's an update to Asterisk 1.6.0.16rc1. If all goes well I plan to commit an update when 1.6.0.16 final is out. chan_unistim will be removed (new Asterisk includes it). app_conference won't build after the update, I plan to replace with the actively maintained appkonference instead (port tgz included if I remember to attach it).
This is pretty similar to my previously published 1.6.0.xx diffs.
If you test, especially if you can try appkonference or use any
unusual modules, please let me know how you get on - thank you.
Index: Makefile
===================================================================
RCS file: /cvs/ports/telephony/asterisk/Makefile,v
retrieving revision 1.60
diff -u -p -r1.60 Makefile
--- Makefile 4 Sep 2009 00:46:35 -0000 1.60
+++ Makefile 21 Sep 2009 21:54:08 -0000
@@ -1,13 +1,13 @@
-# $OpenBSD: Makefile,v 1.60 2009/09/04 00:46:35 sthen Exp $
+# $OpenBSD: Makefile,v 1.53 2009/04/05 22:37:35 sthen Exp $
SHARED_ONLY= Yes
COMMENT-main= open source multi-protocol PBX and telephony toolkit
-VER= 1.4.26.2
+VER= 1.6.0.16rc1
# you can set PATCHVER=p0, p1 etc to bump everything,
# this takes care of the subpackage/flavor maze
PATCHVER=
-CORESOUNDS= 1.4.15
+CORESOUNDS= 1.4.16
DISTNAME= asterisk-${VER:S/rc/-rc/}
FULLPKGNAME-main= asterisk-${VER}${PATCHVER}
@@ -19,22 +19,25 @@ MAINTAINER= Stuart Henderson <st...@ope
# Mostly GPL v2 (only). "Specific permission is also granted to link
# Asterisk with OpenSSL and OpenH323 and distribute the resulting binary
-# files." iaxy.bin (firmware) is freely redistributable, see LICENSE.
-# core-sounds-en-gsm: GPLv2/CC-BY-SA, http://bugs.digium.com/view.php?id=10144
+# files." core-sounds-*: GPLv2/CC-BY-SA.
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-MULTI_PACKAGES= -main
+MULTI_PACKAGES+= -main
SUBST_VARS+= CORESOUNDS
WANTLIB-main= c crypto m pthread ssl stdc++ termcap z
+LIB_DEPENDS-main= gsm::audio/gsm \
+ ogg.>=5::audio/libogg \
+ vorbis.>=5,vorbisenc.>=2::audio/libvorbis \
+ sqlite3.>=3::databases/sqlite3 \
+ execinfo::devel/libexecinfo \
+ popt::devel/popt
-LIB_DEPENDS-main= popt::devel/popt \
- gsm::audio/gsm
-
-MASTER_SITES=
http://downloads.asterisk.org/pub/telephony/asterisk/releases/
+MASTER_SITES= http://downloads.digium.com/pub/telephony/asterisk/releases/ \
+ http://downloads.digium.com/pub/telephony/asterisk/old-releases/
USE_GMAKE= Yes
USE_LIBTOOL= Yes
@@ -45,34 +48,54 @@ AUTOMAKE_VERSION= 1.9
BUILD_DEPENDS+= ${MODGNU_AUTOCONF_DEPENDS} \
${MODGNU_AUTOMAKE_DEPENDS}
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${X11BASE}/include -I${LOCALBASE}/include
+LDFLAGS+= -L${X11BASE}/lib -L${LOCALBASE}/lib
+CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" \
+ CFLAGS="${CFLAGS}" \
+ LDFLAGS="${LDFLAGS}"
+MAKE_ENV+= ASTCFLAGS="${CFLAGS}" \
+ ASTLDFLAGS="${LDFLAGS}" \
+ NOISY_BUILD="Yes"
+# basic stuff
CONFIGURE_ARGS+= --with-asterisk-user=_asterisk \
--with-asterisk-group=_asterisk \
--localstatedir=/var \
- --sharedstatedir=${PREFIX}/share/asterisk \
- --with-asound=no \
+ --sharedstatedir=${PREFIX}/share/asterisk
+# unlikely
+CONFIGURE_ARGS+= --with-asound=no \
+ --with-avcodec=no \
+ --with-cap=no \
+ --with-dahdi=no \
+ --with-gtk=no \
+ --with-gtk2=no \
+ --with-gmime=no \
--with-isdnnet=no \
- --with-kde=no \
--with-misdn=no \
--with-nbs=no \
--with-newt=no \
- --with-popt=${LOCALBASE} \
+ --with-osptk=no \
+ --with-oss=no \
--with-pri=no \
--with-qt=no \
+ --with-sqlite=no \
+ --with-ss7=no \
--with-suppserv=no \
--with-tinfo=no \
--with-tonezone=no \
- --with-vpb=no \
- --with-zaptel=no
+ --with-usb=no \
+ --with-vpb=no
-CONFIGURE_ARGS+= --with-osptk=no \
- --with-oss=no \
+# sometime?
+CONFIGURE_ARGS+= --with-imap=no \
+ --with-jack=no \
+ --with-lua=no \
+ --with-portaudio=no \
--with-radius=no \
- --with-sqlite=no \
- --with-tds=no \
- --with-imap=no
+ --with-resample=no \
+ --with-sdl=no \
+ --with-SDL_image=no \
+ --with-tds=no
# Some build options (including a useful malloc debug) are available
# via menuselect. They may be enabled by running 'make configure', cd
@@ -125,22 +148,6 @@ CONFIGURE_ARGS+= --with-speex=no
# --with-speexdsp=${LOCALBASE}
#.endif
-# ogg
-PSEUDO_FLAVORS+= no_ogg
-.if ${FLAVOR:L:Mno_ogg}
-CONFIGURE_ARGS+= --with-ogg=no \
- --with-vorbis=no
-.else
-MULTI_PACKAGES+= -ogg
-COMMENT-ogg= Ogg Vorbis format translator for Asterisk
-WANTLIB-ogg= m
-LIB_DEPENDS-ogg= ogg.>=5::audio/libogg \
- vorbis.>=5::audio/libvorbis \
- vorbisenc.>=2::audio/libvorbis
-CONFIGURE_ARGS+= --with-ogg=${LOCALBASE} \
- --with-vorbis=${LOCALBASE}
-.endif
-
# curl
PSEUDO_FLAVORS+= no_curl
.if ${FLAVOR:L:Mno_curl}
@@ -166,52 +173,55 @@ CONFIGURE_ARGS+= --with-postgres=${LOCAL
.endif
# jabber
-PSEUDO_FLAVORS+= no_jabber
.if ${FLAVOR:L:Mno_jabber}
-CONFIGURE_ARGS+= --with-gnutls=no \
- --with-iksemel=no
+CONFIGURE_ARGS+= --with-iksemel=no
.else
MULTI_PACKAGES+= -jabber
COMMENT-jabber= Jabber support for Asterisk
-WANTLIB-jabber= gcrypt gnutls gpg-error z
LIB_DEPENDS-jabber= iksemel::textproc/iksemel
-CONFIGURE_ARGS+= --with-gnutls=${LOCALBASE} \
- --with-iksemel=${LOCALBASE}
.endif
# h323
.if ${FLAVOR:L:Mh323}
LIB_DEPENDS-main+= h323::net/openh323 \
pt::devel/pwlib
-CPPFLAGS+= -I${LOCALBASE}/include/openh323
-CONFIGURE_ARGS+= --with-pwlib=${LOCALBASE}/lib \
- --with-h323=${LOCALBASE}/lib
WANTLIB-main+= SDL avutil expat lber ldap ldap_r sasl2
FULLPKGNAME-main= asterisk-${VER}${PATCHVER}-h323
-
-pre-build:
- cd ${WRKSRC} && ${MAKE_PROGRAM} include/asterisk/buildopts.h
- cd ${WRKSRC}/channels/h323 && ${MAKE_PROGRAM} opt
-
.else
CONFIGURE_ARGS+= --with-pwlib=no \
--with-h323=no
.endif
+# ldap
+PSEUDO_FLAVORS+= no_ldap
+.if ${FLAVOR:L:Mno_ldap}
+CONFIGURE_ARGS+= --with-ldap=no
+.else
+MULTI_PACKAGES+= -ldap
+COMMENT-ldap= LDAP support for Asterisk
+LIB_DEPENDS-ldap= ldap::databases/openldap,-main
+.endif
+
+# fax
+PSEUDO_FLAVORS+= no_fax
+.if ${FLAVOR:L:Mno_fax}
+CONFIGURE_ARGS+= --with-spandsp=no
+.else
+MULTI_PACKAGES+= -fax
+COMMENT-fax= FAX support for Asterisk
+LIB_DEPENDS-fax= spandsp::telephony/spandsp \
+ tiff::graphics/tiff
+.endif
+
.for i in ${MULTI_PACKAGES:S/-main//}
FULLPKGNAME$i ?= asterisk$i-${VER}${PATCHVER}
-RUN_DEPENDS$i += :asterisk-${VER}${PATCHVER}:telephony/asterisk
+RUN_DEPENDS$i += :asterisk-${VER}:${PKGPATH}
.endfor
-MAKE_ENV= ASTCFLAGS="${CFLAGS}" \
- ASTLDFLAGS="${LDFLAGS}" \
- DEBUG=""
-
NO_REGRESS= Yes
-
INSTALL_TARGET= install samples
-
EXAMPLEDIR= ${PREFIX}/share/examples/asterisk
+EXAMPLEFILES= extensions logger modules musiconhold sip voicemail
post-patch:
cd ${WRKSRC} && AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
@@ -231,13 +241,14 @@ post-install:
${PREFIX}/share/doc/asterisk
${INSTALL_DATA} `find ${WRKSRC}/doc -type f` \
${PREFIX}/share/doc/asterisk
- ${INSTALL_DATA_DIR} ${EXAMPLEDIR}
${INSTALL_DATA_DIR} ${EXAMPLEDIR}/openbsd
- ${INSTALL_DATA} ${FILESDIR}/*.sample ${EXAMPLEDIR}/openbsd
- @perl -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g;" \
- ${EXAMPLEDIR}/openbsd/*
+.for i in ${EXAMPLEFILES}
+ @${SUBST_CMD} -c ${FILESDIR}/$i.conf.sample \
+ ${EXAMPLEDIR}/openbsd/$i.conf.sample
+.endfor
@mv ${WRKINST}/${SYSCONFDIR}/asterisk ${EXAMPLEDIR}/default
@mv ${WRKINST}/var/spool/asterisk/voicemail ${EXAMPLEDIR}/voicemail
+ @chown -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLEDIR}
@rm -rf ${WRKINST}/{etc,var/{log,run,spool}}/asterisk
.include <bsd.port.mk>
appkonference.tgz
Description: application/tar-gz
