Date: Tue, 21 Sep 2010 19:00:18 GMT From: Florian Smeets <flo@smeets.im> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/146964: New port: net/asterisk162 Message-ID: <201009211900.o8LJ0IX3030576@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/146964; it has been noted by GNATS. From: Florian Smeets <flo@smeets.im> To: bug-followup@FreeBSD.org, emz@norma.perm.ru Cc: TAKATSU Tomonari <tota@FreeBSD.org> Subject: Re: ports/146964: New port: net/asterisk162 Date: Tue, 21 Sep 2010 20:57:22 +0200 This is a multi-part message in MIME format. --------------030302080308090603070000 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Hi, i have adapted the patch to update net/asterisk16 to 1.6.2.13 and tweaked a couple of other things. Cheers, Florian --------------030302080308090603070000 Content-Type: text/plain; x-mac-type="0"; x-mac-creator="0"; name="asterisk16-1.6.2.13.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="asterisk16-1.6.2.13.diff" diff -ruN --exclude=CVS /usr/ports/net/asterisk16.orig/Makefile /usr/ports/net/asterisk16/Makefile --- /usr/ports/net/asterisk16.orig/Makefile 2010-09-21 07:42:50.000000000 +0200 +++ /usr/ports/net/asterisk16/Makefile 2010-09-21 20:13:01.000000000 +0200 @@ -2,16 +2,15 @@ # Date created: 17 October 2003 # Whom: Maxim Sobolev <sobomax@portaone.com> # -# $FreeBSD: ports/net/asterisk16/Makefile,v 1.136 2010/09/17 08:32:54 linimon Exp $ +# $FreeBSD: ports/net/asterisk16/Makefile,v 1.132 2010/04/03 10:44:26 roam Exp $ # PORTNAME= asterisk -PORTVERSION= 1.6.0.21 -PORTREVISION= 4 -PKGNAMESUFFIX= 16 +PORTVERSION= 1.6.2.13 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \ http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ +PKGNAMESUFFIX= 16 MAINTAINER= flo@kasimir.com COMMENT= An Open Source PBX and telephony toolkit @@ -19,6 +18,9 @@ LIB_DEPENDS= speex.1:${PORTSDIR}/audio/speex \ newt.52:${PORTSDIR}/devel/newt \ execinfo:${PORTSDIR}/devel/libexecinfo + +USE_GNOME= libxml2 + RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 ONLY_FOR_ARCHS= i386 amd64 @@ -26,7 +28,7 @@ GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/openh323" \ LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --with-gsm=${LOCALBASE} +CONFIGURE_ARGS= --with-gsm=${LOCALBASE} --localstatedir=/var CPPFLAGS= -I${LOCALBASE}/include -I${LOCALBASE}/include/openh323 USE_GMAKE= yes USE_BISON= build @@ -55,15 +57,12 @@ GSM "Enable GSM codec" on \ CURL "Enable CURL support" on \ ILBC "Enable iLBC codec" off \ - SPANDSP "Enable Spandsp faxing support" off \ -# CODEC_PATCH "Apply codec negotiation patch" off \ -# MISC_PATCHES "Apply additional patches" off + SPANDSP "Enable Spandsp faxing support" off .include <bsd.port.pre.mk> .if ${ARCH} == "i386" || ${ARCH} == "amd64" OPTIONS+= DAHDI "Enable DAHDI support" on - # Include this since we have altered OPTIONS. .include "$(PORTSDIR)/Mk/bsd.port.options.mk" .endif @@ -95,12 +94,12 @@ # similarly .if !defined(WITH_ODBC) PLIST_SUB+= WITH_ODBC="@comment " -CONFIGURE_ARGS+= --without-odbc +CONFIGURE_ARGS+= --without-unixodbc .else PLIST_SUB+= WITH_ODBC="" -CONFIGURE_ARGS+= --with-odbc --with-ltdl -LIB_DEPENDS+= odbc.1:${PORTSDIR}/databases/unixODBC \ - ltdl.7:${PORTSDIR}/devel/libltdl22 +CONFIGURE_ARGS+= --with-unixodbc --with-ltdl +LIB_DEPENDS+= odbc.1:${PORTSDIR}/databases/unixODBC +USE_AUTOTOOLS= libltdl .endif .if !defined(WITH_FREETDS) @@ -145,7 +144,7 @@ .else PLIST_SUB+= WITH_SNMP="" CONFIGURE_ARGS+= --with-netsnmp -LIB_DEPENDS+= netsnmp.20:${PORTSDIR}/net-mgmt/net-snmp +LIB_DEPENDS+= netsnmp:${PORTSDIR}/net-mgmt/net-snmp .endif .if !defined(WITH_JABBER) @@ -186,12 +185,10 @@ .if !defined(WITH_CURL) PLIST_SUB+= WITH_CURL="@comment " -CONFIGURE_ARGS+= --with-curl=no \ - --with-libcurl=no +CONFIGURE_ARGS+= --with-libcurl=no .else PLIST_SUB+= WITH_CURL="" -CONFIGURE_ARGS+= --with-curl \ - --with-libcurl +CONFIGURE_ARGS+= --with-libcurl LIB_DEPENDS+= curl.6:${PORTSDIR}/ftp/curl .endif @@ -204,14 +201,6 @@ LIB_DEPENDS+= spandsp.2:${PORTSDIR}/comms/spandsp-devel .endif -.if defined(WITH_CODEC_PATCH) -PATCHFILES= asterisk-1.4.22-codec-negotiation-20081110.diff.gz -PATCH_SITES= http://b2bua.org/chrome/site/ -EXTRA_PATCHES+= ${PATCHDIR}/codecnego-patch-Makefile -.else -EXTRA_PATCHES+= ${PATCHDIR}/nocodecnego-patch-Makefile -.endif - .if defined(WITH_MISC_PATCHES) EXTRA_PATCHES+= ${PATCHDIR}/dtmf_debug.diff EXTRA_PATCHES+= ${PATCHDIR}/feature_disconnect.diff diff -ruN --exclude=CVS /usr/ports/net/asterisk16.orig/distinfo /usr/ports/net/asterisk16/distinfo --- /usr/ports/net/asterisk16.orig/distinfo 2010-09-21 07:42:50.000000000 +0200 +++ /usr/ports/net/asterisk16/distinfo 2010-09-21 07:43:15.000000000 +0200 @@ -1,3 +1,3 @@ -MD5 (asterisk-1.6.0.21.tar.gz) = a172fb030adab50bdff6ae3b5e765283 -SHA256 (asterisk-1.6.0.21.tar.gz) = 0d41a9033934640992da29ee03ae96a208eb3ff8a46440e388920d471ecbbaff -SIZE (asterisk-1.6.0.21.tar.gz) = 23145584 +MD5 (asterisk-1.6.2.13.tar.gz) = 1e184a4d9301e2e4b9de3bc98b507d4f +SHA256 (asterisk-1.6.2.13.tar.gz) = 28bb18e988d22557ee77220cb33209212af1e618348c3d42666f785da517c01e +SIZE (asterisk-1.6.2.13.tar.gz) = 23679304 diff -ruN --exclude=CVS /usr/ports/net/asterisk16.orig/files/asterisk.sh.in /usr/ports/net/asterisk16/files/asterisk.sh.in --- /usr/ports/net/asterisk16.orig/files/asterisk.sh.in 2010-09-21 07:42:50.000000000 +0200 +++ /usr/ports/net/asterisk16/files/asterisk.sh.in 2010-09-21 13:18:06.000000000 +0200 @@ -11,10 +11,10 @@ . /etc/rc.subr -stop_precmd=asterisk_shutdown -sig_stop=KILL +stop_cmd=asterisk_shutdown asterisk_shutdown () { - %%PREFIX%%/sbin/asterisk -qrx 'stop now' + echo 'Stopping asterisk' + %%PREFIX%%/sbin/asterisk -qrx 'core stop now' sleep 1 return 0 } diff -ruN --exclude=CVS /usr/ports/net/asterisk16.orig/files/codecnego-patch-Makefile /usr/ports/net/asterisk16/files/codecnego-patch-Makefile --- /usr/ports/net/asterisk16.orig/files/codecnego-patch-Makefile 2010-09-21 07:42:50.000000000 +0200 +++ /usr/ports/net/asterisk16/files/codecnego-patch-Makefile 1970-01-01 01:00:00.000000000 +0100 @@ -1,210 +0,0 @@ ---- Makefile.orig 2008-10-16 17:36:35.000000000 +0300 -+++ Makefile 2008-10-16 17:36:36.000000000 +0300 -@@ -129,7 +129,7 @@ - ASTMANDIR=$(mandir) - ifneq ($(findstring BSD,$(OSARCH)),) - ASTVARLIBDIR=$(prefix)/share/asterisk -- ASTVARRUNDIR=$(localstatedir)/run/asterisk -+ ASTVARRUNDIR=$(localstatedir)/run - else - ASTVARLIBDIR=$(localstatedir)/lib/asterisk - endif -@@ -214,9 +214,11 @@ - ASTLDFLAGS+=-L/usr/local/lib - endif - -+ifneq ($(OSARCH),FreeBSD) - ifneq ($(PROC),ultrasparc) - ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi) - endif -+endif - - ifeq ($(PROC),ppc) - ASTCFLAGS+=-fsigned-char -@@ -224,7 +226,7 @@ - - ifeq ($(OSARCH),FreeBSD) - # -V is understood by BSD Make, not by GNU make. -- BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk) -+ BSDVERSION=$(OSVERSION) - ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi) - AST_LIBS+=$(shell if test $(BSDVERSION) -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi) - endif -@@ -401,15 +403,15 @@ - # Should static HTTP be installed during make samples or even with its own target ala - # webvoicemail? There are portions here that *could* be customized but might also be - # improved a lot. I'll put it here for now. -- mkdir -p $(DESTDIR)$(ASTDATADIR)/static-http -+ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/static-http - for x in static-http/*; do \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/static-http ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTDATADIR)/static-http ; \ - done -- mkdir -p $(DESTDIR)$(ASTDATADIR)/images -+ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/images - for x in images/*.jpg; do \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/images ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTDATADIR)/images ; \ - done -- mkdir -p $(DESTDIR)$(AGI_DIR) -+ $(MKDIR) $(DESTDIR)$(AGI_DIR) - $(MAKE) -C sounds install - - update: -@@ -430,47 +432,47 @@ - OLDHEADERS=$(filter-out $(NEWHEADERS),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h))) - - installdirs: -- mkdir -p $(DESTDIR)$(MODULES_DIR) -- mkdir -p $(DESTDIR)$(ASTSBINDIR) -- mkdir -p $(DESTDIR)$(ASTETCDIR) -- mkdir -p $(DESTDIR)$(ASTBINDIR) -- mkdir -p $(DESTDIR)$(ASTVARRUNDIR) -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/dictate -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/system -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/tmp -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/meetme -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/monitor -+ $(MKDIR) $(DESTDIR)$(MODULES_DIR) -+ $(MKDIR) $(DESTDIR)$(ASTSBINDIR) -+ $(MKDIR) $(DESTDIR)$(ASTETCDIR) -+ $(MKDIR) $(DESTDIR)$(ASTBINDIR) -+ $(MKDIR) $(DESTDIR)$(ASTVARRUNDIR) -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/dictate -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/system -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/tmp -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/meetme -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/monitor - - bininstall: _all installdirs $(SUBDIRS_INSTALL) -- $(INSTALL) -m 755 main/asterisk $(DESTDIR)$(ASTSBINDIR)/ -+ $(BSD_INSTALL_PROGRAM) main/asterisk $(DESTDIR)$(ASTSBINDIR)/ - $(LN) -sf asterisk $(DESTDIR)$(ASTSBINDIR)/rasterisk -- $(INSTALL) -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/ -- $(INSTALL) -m 755 contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/ -+ $(BSD_INSTALL_SCRIPT) contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/ -+ $(BSD_INSTALL_SCRIPT) contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/ - if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \ -- cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ;\ -- chmod 755 $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\ -+ cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > contrib/scripts/safe_asterisk.out;\ -+ ${BSD_INSTALL_SCRIPT} contrib/scripts/safe_asterisk.out $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ;\ - fi -- $(INSTALL) -d $(DESTDIR)$(ASTHEADERDIR) -- $(INSTALL) -m 644 include/asterisk.h $(DESTDIR)$(includedir) -- $(INSTALL) -m 644 include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR) -+ $(MKDIR) $(DESTDIR)$(ASTHEADERDIR) -+ $(BSD_INSTALL_DATA) include/asterisk.h $(DESTDIR)$(includedir) -+ $(BSD_INSTALL_DATA) include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR) - if [ -n "$(OLDHEADERS)" ]; then \ - rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\ - fi -- mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv -- mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-custom -- mkdir -p $(DESTDIR)$(ASTDATADIR)/keys -- mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware -- mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware/iax -- mkdir -p $(DESTDIR)$(ASTMANDIR)/man8 -- $(INSTALL) -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys -- $(INSTALL) -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys -- $(INSTALL) -m 644 doc/asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 -- $(INSTALL) -m 644 contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8 -- $(INSTALL) -m 644 contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8 -- $(INSTALL) -m 644 contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 -+ $(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-csv -+ $(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-custom -+ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/keys -+ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/firmware -+ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/firmware/iax -+ $(MKDIR) $(DESTDIR)$(ASTMANDIR)/man8 -+ $(BSD_INSTALL_DATA) keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys -+ $(BSD_INSTALL_DATA) keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys -+ $(BSD_INSTALL_MAN) doc/asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 -+ $(BSD_INSTALL_MAN) contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8 -+ $(BSD_INSTALL_MAN) contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8 -+ $(BSD_INSTALL_MAN) contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 - if [ -f contrib/firmware/iax/iaxy.bin ] ; then \ -- $(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin; \ -+ $(BSD_INSTALL_DATA) contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin; \ - fi - - $(SUBDIRS_INSTALL): -@@ -506,7 +508,7 @@ - @exit 1 - endif - --install: badshell datafiles bininstall -+install: badshell datafiles bininstall samples - @if [ -x /usr/sbin/asterisk-post-install ]; then \ - /usr/sbin/asterisk-post-install $(DESTDIR) . ; \ - fi -@@ -544,31 +546,23 @@ - upgrade: bininstall - - adsi: -- mkdir -p $(DESTDIR)$(ASTETCDIR) -+ $(MKDIR) $(DESTDIR)$(ASTETCDIR) - for x in configs/*.adsi; do \ - if [ ! -f $(DESTDIR)$(ASTETCDIR)/$$x ]; then \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x` ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x` ; \ - fi ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`-dist ; \ - done - - samples: adsi -- mkdir -p $(DESTDIR)$(ASTETCDIR) -+ $(MKDIR) $(DESTDIR)$(ASTETCDIR) - for x in configs/*.sample; do \ -- if [ -f $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` ]; then \ -- if [ "$(OVERWRITE)" = "y" ]; then \ -- if cmp -s $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` $$x ; then \ -- echo "Config file $$x is unchanged"; \ -- continue; \ -- fi ; \ -- mv -f $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`.old ; \ -- else \ -- echo "Skipping config file $$x"; \ -- continue; \ -- fi ;\ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`-dist ;\ -+ if [ ! -f $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` ]; then \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`;\ - fi ; \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` ;\ - done -- if [ "$(OVERWRITE)" = "y" ] || [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \ -+ if true; then \ - ( \ - echo "[directories]" ; \ - echo "astetcdir => $(ASTETCDIR)" ; \ -@@ -655,20 +649,23 @@ - echo "; Default: strict"; \ - echo ";"; \ - echo ";translation_algorithm = strict"; \ -- ) > $(DESTDIR)$(ASTCONFPATH) ; \ -+ ) > $(DESTDIR)$(ASTCONFPATH)-dist ; \ -+ if [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \ -+ cp $(DESTDIR)$(ASTCONFPATH)-dist $(DESTDIR)$(ASTCONFPATH); \ -+ fi; \ - else \ - echo "Skipping asterisk.conf creation"; \ - fi -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX - build_tools/make_sample_voicemail $(DESTDIR)/$(ASTDATADIR) $(DESTDIR)/$(ASTSPOOLDIR) - - webvmail: - @[ -d $(DESTDIR)$(HTTP_DOCSDIR)/ ] || ( printf "http docs directory not found.\nUpdate assignment of variable HTTP_DOCSDIR in Makefile!\n" && exit 1 ) - @[ -d $(DESTDIR)$(HTTP_CGIDIR) ] || ( printf "cgi-bin directory not found.\nUpdate assignment of variable HTTP_CGIDIR in Makefile!\n" && exit 1 ) - $(INSTALL) -m 4755 -o root -g root contrib/scripts/vmail.cgi $(DESTDIR)$(HTTP_CGIDIR)/vmail.cgi -- mkdir -p $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk -+ $(MKDIR) $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk - for x in images/*.gif; do \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/; \ - done - @echo " +--------- Asterisk Web Voicemail ----------+" - @echo " + +" diff -ruN --exclude=CVS /usr/ports/net/asterisk16.orig/files/nocodecnego-patch-Makefile /usr/ports/net/asterisk16/files/nocodecnego-patch-Makefile --- /usr/ports/net/asterisk16.orig/files/nocodecnego-patch-Makefile 2010-09-21 07:42:50.000000000 +0200 +++ /usr/ports/net/asterisk16/files/nocodecnego-patch-Makefile 1970-01-01 01:00:00.000000000 +0100 @@ -1,243 +0,0 @@ ---- Makefile.orig 2009-11-03 12:00:27.000000000 -0800 -+++ Makefile 2009-11-20 13:13:06.000000000 -0800 -@@ -118,7 +118,7 @@ - OVERWRITE=y - - # Include debug and macro symbols in the executables (-g) and profiling info (-pg) --DEBUG=-g3 -+#DEBUG=-g3 - - - # Define standard directories for various platforms -@@ -148,7 +148,7 @@ - ASTMANDIR=$(mandir) - ifneq ($(findstring BSD,$(OSARCH)),) - ASTVARLIBDIR=$(prefix)/share/asterisk -- ASTVARRUNDIR=$(localstatedir)/run/asterisk -+ ASTVARRUNDIR=$(localstatedir)/run - ASTDBDIR=$(localstatedir)/db/asterisk - else - ASTVARLIBDIR=$(localstatedir)/lib/asterisk -@@ -248,9 +248,11 @@ - _ASTCFLAGS+=-isystem /usr/local/include - endif - -+ifneq ($(OSARCH),FreeBSD) - ifneq ($(PROC),ultrasparc) - _ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi) - endif -+endif - - ifeq ($(PROC),ppc) - _ASTCFLAGS+=-fsigned-char -@@ -258,7 +260,7 @@ - - ifeq ($(OSARCH),FreeBSD) - # -V is understood by BSD Make, not by GNU make. -- BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk) -+ BSDVERSION=$(OSVERSION) - _ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi) - endif - -@@ -467,21 +469,21 @@ - # Should static HTTP be installed during make samples or even with its own target ala - # webvoicemail? There are portions here that *could* be customized but might also be - # improved a lot. I'll put it here for now. -- mkdir -p $(DESTDIR)$(ASTDATADIR)/static-http -+ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/static-http - for x in static-http/*; do \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/static-http ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTDATADIR)/static-http ; \ - done - if [ -d doc/tex/asterisk ] ; then \ -- mkdir -p $(DESTDIR)$(ASTDATADIR)/static-http/docs ; \ -+ $(MKDIR) $(DESTDIR)$(DOCSDIR) ; \ - for n in doc/tex/asterisk/* ; do \ -- $(INSTALL) -m 644 $$n $(DESTDIR)$(ASTDATADIR)/static-http/docs ; \ -+ $(BSD_INSTALL_DATA) $$n $(DESTDIR)$(DOCSDIR) ; \ - done \ - fi -- mkdir -p $(DESTDIR)$(ASTDATADIR)/images -+ $(MKDIR) $(DESTDIR)$(DOCSDIR)/images - for x in images/*.jpg; do \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/images ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(DOCSDIR)/images ; \ - done -- mkdir -p $(DESTDIR)$(AGI_DIR) -+ $(MKDIR) $(DESTDIR)$(AGI_DIR) - $(MAKE) -C sounds install - - update: -@@ -505,47 +507,47 @@ - OLDHEADERS=$(filter-out $(NEWHEADERS),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h))) - - installdirs: -- mkdir -p $(DESTDIR)$(MODULES_DIR) -- mkdir -p $(DESTDIR)$(ASTSBINDIR) -- mkdir -p $(DESTDIR)$(ASTETCDIR) -- mkdir -p $(DESTDIR)$(ASTBINDIR) -- mkdir -p $(DESTDIR)$(ASTVARRUNDIR) -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/dictate -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/system -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/tmp -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/meetme -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/monitor -+ $(MKDIR) $(DESTDIR)$(MODULES_DIR) -+ $(MKDIR) $(DESTDIR)$(ASTSBINDIR) -+ $(MKDIR) $(DESTDIR)$(ASTETCDIR) -+ $(MKDIR) $(DESTDIR)$(ASTBINDIR) -+ $(MKDIR) $(DESTDIR)$(ASTVARRUNDIR) -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/dictate -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/system -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/tmp -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/meetme -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/monitor - - bininstall: _all installdirs $(SUBDIRS_INSTALL) -- $(INSTALL) -m 755 main/asterisk $(DESTDIR)$(ASTSBINDIR)/ -+ $(BSD_INSTALL_PROGRAM) main/asterisk $(DESTDIR)$(ASTSBINDIR)/ - $(LN) -sf asterisk $(DESTDIR)$(ASTSBINDIR)/rasterisk -- $(INSTALL) -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/ -- $(INSTALL) -m 755 contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/ -+ $(BSD_INSTALL_SCRIPT) contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/ -+ $(BSD_INSTALL_SCRIPT) contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/ - if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \ -- cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ;\ -- chmod 755 $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\ -+ cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > contrib/scripts/safe_asterisk.out;\ -+ ${BSD_INSTALL_SCRIPT} contrib/scripts/safe_asterisk.out $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\ - fi -- $(INSTALL) -d $(DESTDIR)$(ASTHEADERDIR) -- $(INSTALL) -m 644 include/asterisk.h $(DESTDIR)$(includedir) -- $(INSTALL) -m 644 include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR) -+ $(MKDIR) $(DESTDIR)$(ASTHEADERDIR) -+ $(BSD_INSTALL_DATA) include/asterisk.h $(DESTDIR)$(includedir) -+ $(BSD_INSTALL_DATA) include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR) - if [ -n "$(OLDHEADERS)" ]; then \ - rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\ - fi -- mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv -- mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-custom -- mkdir -p $(DESTDIR)$(ASTDATADIR)/keys -- mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware -- mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware/iax -- mkdir -p $(DESTDIR)$(ASTMANDIR)/man8 -- $(INSTALL) -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys -- $(INSTALL) -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys -- $(INSTALL) -m 644 doc/asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 -- $(INSTALL) -m 644 contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8 -- $(INSTALL) -m 644 contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8 -- $(INSTALL) -m 644 contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 -+ $(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-csv -+ $(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-custom -+ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/keys -+ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/firmware -+ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/firmware/iax -+ $(MKDIR) $(DESTDIR)$(ASTMANDIR)/man8 -+ $(BSD_INSTALL_DATA) keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys -+ $(BSD_INSTALL_DATA) keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys -+ $(BSD_INSTALL_MAN) doc/asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 -+ $(BSD_INSTALL_MAN) contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8 -+ $(BSD_INSTALL_MAN) contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8 -+ $(BSD_INSTALL_MAN) contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 - if [ -f contrib/firmware/iax/iaxy.bin ] ; then \ -- $(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin; \ -+ $(BSD_INSTALL_DATA) contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin; \ - fi - - $(SUBDIRS_INSTALL): -@@ -579,7 +581,7 @@ - @exit 1 - endif - --install: badshell datafiles bininstall -+install: badshell datafiles bininstall samples - @if [ -x /usr/sbin/asterisk-post-install ]; then \ - /usr/sbin/asterisk-post-install $(DESTDIR) . ; \ - fi -@@ -611,38 +613,25 @@ - # XXX why *.adsi is installed first ? - adsi: - @echo Installing adsi config files... -- @mkdir -p $(DESTDIR)$(ASTETCDIR) -+ @$(MKDIR) $(DESTDIR)$(ASTETCDIR) - @for x in configs/*.adsi; do \ - dst="$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`" ; \ - if [ -f $${dst} ] ; then \ -- echo "Overwriting $$x" ; \ -- else \ -- echo "Installing $$x" ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x` ; \ - fi ; \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x` ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`-dist ; \ - done - - samples: adsi - @echo Installing other config files... -- @mkdir -p $(DESTDIR)$(ASTETCDIR) -+ @$(MKDIR) $(DESTDIR)$(ASTETCDIR) - @for x in configs/*.sample; do \ -- dst="$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`" ; \ -- if [ -f $${dst} ]; then \ -- if [ "$(OVERWRITE)" = "y" ]; then \ -- if cmp -s $${dst} $$x ; then \ -- echo "Config file $$x is unchanged"; \ -- continue; \ -- fi ; \ -- mv -f $${dst} $${dst}.old ; \ -- else \ -- echo "Skipping config file $$x"; \ -- continue; \ -- fi ;\ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`-dist ;\ -+ if [ ! -f $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` ]; then \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`;\ - fi ; \ -- echo "Installing file $$x"; \ -- $(INSTALL) -m 644 $$x $${dst} ;\ - done -- @if [ "$(OVERWRITE)" = "y" ] || [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \ -+ @if true; then \ - echo "Creating asterisk.conf"; \ - ( \ - echo "[directories](!) ; remove the (!) to enable this" ; \ -@@ -698,13 +687,16 @@ - echo "pbx_realtime=1.6" ; \ - echo "res_agi=1.6" ; \ - echo "app_set=1.6" ; \ -- ) > $(DESTDIR)$(ASTCONFPATH) ; \ -+ ) > $(DESTDIR)$(ASTCONFPATH)-dist ; \ -+ if [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \ -+ $(BSD_INSTALL_DATA) $(DESTDIR)$(ASTCONFPATH)-dist $(DESTDIR)$(ASTCONFPATH); \ -+ fi; \ - else \ - echo "Skipping asterisk.conf creation"; \ - fi -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX - build_tools/make_sample_voicemail $(DESTDIR)/$(ASTDATADIR) $(DESTDIR)/$(ASTSPOOLDIR) -- @mkdir -p $(DESTDIR)$(ASTDATADIR)/phoneprov -+ @$(MKDIR) $(DESTDIR)$(ASTDATADIR)/phoneprov - @for x in phoneprov/*; do \ - dst="$(DESTDIR)$(ASTDATADIR)/$$x" ; \ - if [ -f $${dst} ]; then \ -@@ -720,14 +712,14 @@ - fi ;\ - fi ; \ - echo "Installing file $$x"; \ -- $(INSTALL) -m 644 $$x $${dst} ;\ -+ $(BSD_INSTALL_DATA) $$x $${dst} ;\ - done - - webvmail: - @[ -d $(DESTDIR)$(HTTP_DOCSDIR)/ ] || ( printf "http docs directory not found.\nUpdate assignment of variable HTTP_DOCSDIR in Makefile!\n" && exit 1 ) - @[ -d $(DESTDIR)$(HTTP_CGIDIR) ] || ( printf "cgi-bin directory not found.\nUpdate assignment of variable HTTP_CGIDIR in Makefile!\n" && exit 1 ) - $(INSTALL) -m 4755 -o root -g root contrib/scripts/vmail.cgi $(DESTDIR)$(HTTP_CGIDIR)/vmail.cgi -- mkdir -p $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk -+ $(MKDIR) $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk - for x in images/*.gif; do \ - $(INSTALL) -m 644 $$x $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/; \ - done diff -ruN --exclude=CVS /usr/ports/net/asterisk16.orig/files/patch-Makefile /usr/ports/net/asterisk16/files/patch-Makefile --- /usr/ports/net/asterisk16.orig/files/patch-Makefile 1970-01-01 01:00:00.000000000 +0100 +++ /usr/ports/net/asterisk16/files/patch-Makefile 2010-09-21 13:18:29.000000000 +0200 @@ -0,0 +1,257 @@ +--- Makefile.orig 2010-06-10 22:35:06.000000000 +0200 ++++ Makefile 2010-09-21 13:17:37.000000000 +0200 +@@ -121,7 +121,7 @@ + OVERWRITE=y + + # Include debug and macro symbols in the executables (-g) and profiling info (-pg) +-DEBUG=-g3 ++#DEBUG=-g3 + + + # Define standard directories for various platforms +@@ -149,7 +149,7 @@ + ASTMANDIR=$(mandir) + ifneq ($(findstring BSD,$(OSARCH)),) + ASTVARLIBDIR=$(prefix)/share/asterisk +- ASTVARRUNDIR=$(localstatedir)/run/asterisk ++ ASTVARRUNDIR=$(localstatedir)/run + ASTDBDIR=$(localstatedir)/db/asterisk + else + ASTVARLIBDIR=$(localstatedir)/lib/asterisk +@@ -248,12 +248,13 @@ + ifneq ($(findstring BSD,$(OSARCH)),) + _ASTCFLAGS+=-isystem /usr/local/include + endif +- ++ifneq ($(OSARCH),FreeBSD) + ifeq ($(findstring -march,$(_ASTCFLAGS) $(ASTCFLAGS)),) + ifneq ($(PROC),ultrasparc) + _ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi) + endif + endif ++endif + + ifeq ($(PROC),ppc) + _ASTCFLAGS+=-fsigned-char +@@ -261,7 +262,7 @@ + + ifeq ($(OSARCH),FreeBSD) + # -V is understood by BSD Make, not by GNU make. +- BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk) ++ BSDVERSION=$(OSVERSION) + _ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi) + endif + +@@ -478,21 +479,23 @@ + # Should static HTTP be installed during make samples or even with its own target ala + # webvoicemail? There are portions here that *could* be customized but might also be + # improved a lot. I'll put it here for now. +- mkdir -p $(DESTDIR)$(ASTDATADIR)/static-http ++ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/static-http + for x in static-http/*; do \ +- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/static-http ; \ ++ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTDATADIR)/static-http ; \ + done + if [ -d doc/tex/asterisk ] ; then \ +- mkdir -p $(DESTDIR)$(ASTDATADIR)/static-http/docs ; \ ++ $(MKDIR) $(DESTDIR)$(DOCSDIR) ; \ + for n in doc/tex/asterisk/* ; do \ +- $(INSTALL) -m 644 $$n $(DESTDIR)$(ASTDATADIR)/static-http/docs ; \ ++ $(BSD_INSTALL_DATA) $$n $(DESTDIR)$(DOCSDIR) ; \ + done \ + fi +- mkdir -p $(DESTDIR)$(ASTDATADIR)/images ++ if [ ! -d $(DESTDIR)$(DOCSDIR)/images ]; then \ ++ $(MKDIR) $(DESTDIR)$(DOCSDIR)/images; \ ++ fi + for x in images/*.jpg; do \ +- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/images ; \ ++ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(DOCSDIR)/images ; \ + done +- mkdir -p $(DESTDIR)$(AGI_DIR) ++ $(MKDIR) $(DESTDIR)$(AGI_DIR) + $(MAKE) -C sounds install + + doc/core-en_US.xml: $(foreach dir,$(MOD_SUBDIRS),$(shell $(GREP) -l "language=\"en_US\"" $(dir)/*.c $(dir)/*.cc 2>/dev/null)) +@@ -539,50 +542,51 @@ + OLDHEADERS=$(filter-out $(NEWHEADERS),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h))) + + installdirs: +- mkdir -p $(DESTDIR)$(MODULES_DIR) +- mkdir -p $(DESTDIR)$(ASTSBINDIR) +- mkdir -p $(DESTDIR)$(ASTETCDIR) +- mkdir -p $(DESTDIR)$(ASTVARRUNDIR) +- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail +- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/dictate +- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/system +- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/tmp +- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/meetme +- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/monitor ++ $(MKDIR) $(DESTDIR)$(MODULES_DIR) ++ $(MKDIR) $(DESTDIR)$(ASTSBINDIR) ++ $(MKDIR) $(DESTDIR)$(ASTETCDIR) ++ $(MKDIR) $(DESTDIR)$(ASTVARRUNDIR) ++ $(MKDIR) $(DESTDIR)$(ASTDBDIR) ++ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail ++ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/dictate ++ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/system ++ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/tmp ++ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/meetme ++ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/monitor + + bininstall: _all installdirs $(SUBDIRS_INSTALL) +- $(INSTALL) -m 755 main/asterisk $(DESTDIR)$(ASTSBINDIR)/ ++ $(BSD_INSTALL_PROGRAM) main/asterisk $(DESTDIR)$(ASTSBINDIR)/ + $(LN) -sf asterisk $(DESTDIR)$(ASTSBINDIR)/rasterisk +- $(INSTALL) -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/ +- $(INSTALL) -m 755 contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/ ++ $(BSD_INSTALL_SCRIPT) contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/ ++ $(BSD_INSTALL_SCRIPT) contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/ + if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \ +- cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ;\ +- chmod 755 $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\ ++ cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > contrib/scripts/safe_asterisk.out;\ ++ ${BSD_INSTALL_SCRIPT} contrib/scripts/safe_asterisk.out $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\ + fi +- $(INSTALL) -d $(DESTDIR)$(ASTHEADERDIR) +- $(INSTALL) -m 644 include/asterisk.h $(DESTDIR)$(includedir) +- $(INSTALL) -m 644 include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR) ++ $(MKDIR) $(DESTDIR)$(ASTHEADERDIR) ++ $(BSD_INSTALL_DATA) include/asterisk.h $(DESTDIR)$(includedir) ++ $(BSD_INSTALL_DATA) include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR) + if [ -n "$(OLDHEADERS)" ]; then \ + rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\ + fi +- mkdir -p $(DESTDIR)$(ASTDATADIR)/documentation +- mkdir -p $(DESTDIR)$(ASTDATADIR)/documentation/thirdparty +- mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv +- mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-custom +- mkdir -p $(DESTDIR)$(ASTDATADIR)/keys +- mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware +- mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware/iax +- mkdir -p $(DESTDIR)$(ASTMANDIR)/man8 +- $(INSTALL) -m 644 doc/core-*.xml $(DESTDIR)$(ASTDATADIR)/documentation +- $(INSTALL) -m 644 doc/appdocsxml.dtd $(DESTDIR)$(ASTDATADIR)/documentation +- $(INSTALL) -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys +- $(INSTALL) -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys +- $(INSTALL) -m 644 doc/asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 +- $(INSTALL) -m 644 contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8 +- $(INSTALL) -m 644 contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8 +- $(INSTALL) -m 644 contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 ++ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/documentation ++ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/documentation/thirdparty ++ $(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-csv ++ $(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-custom ++ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/keys ++ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/firmware ++ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/firmware/iax ++ $(MKDIR) $(DESTDIR)$(ASTMANDIR)/man8 ++ $(BSD_INSTALL_DATA) doc/core-*.xml $(DESTDIR)$(ASTDATADIR)/documentation ++ $(BSD_INSTALL_DATA) doc/appdocsxml.dtd $(DESTDIR)$(ASTDATADIR)/documentation ++ $(BSD_INSTALL_DATA) keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys ++ $(BSD_INSTALL_DATA) keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys ++ $(BSD_INSTALL_MAN) doc/asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 ++ $(BSD_INSTALL_MAN) contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8 ++ $(BSD_INSTALL_MAN) contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8 ++ $(BSD_INSTALL_MAN) contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 + if [ -f contrib/firmware/iax/iaxy.bin ] ; then \ +- $(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin; \ ++ $(BSD_INSTALL_DATA) contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin; \ + fi + + $(SUBDIRS_INSTALL): +@@ -616,7 +620,7 @@ + @exit 1 + endif + +-install: badshell datafiles bininstall ++install: badshell datafiles bininstall samples + @if [ -x /usr/sbin/asterisk-post-install ]; then \ + /usr/sbin/asterisk-post-install $(DESTDIR) . ; \ + fi +@@ -650,38 +654,25 @@ + # XXX why *.adsi is installed first ? + adsi: + @echo Installing adsi config files... +- @mkdir -p $(DESTDIR)$(ASTETCDIR) ++ @$(MKDIR) $(DESTDIR)$(ASTETCDIR) + @for x in configs/*.adsi; do \ + dst="$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`" ; \ + if [ -f $${dst} ] ; then \ +- echo "Overwriting $$x" ; \ +- else \ +- echo "Installing $$x" ; \ ++ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x` ; \ + fi ; \ +- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x` ; \ ++ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`-dist ; \ + done + + samples: adsi + @echo Installing other config files... +- @mkdir -p $(DESTDIR)$(ASTETCDIR) ++ @$(MKDIR) $(DESTDIR)$(ASTETCDIR) + @for x in configs/*.sample; do \ +- dst="$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`" ; \ +- if [ -f $${dst} ]; then \ +- if [ "$(OVERWRITE)" = "y" ]; then \ +- if cmp -s $${dst} $$x ; then \ +- echo "Config file $$x is unchanged"; \ +- continue; \ +- fi ; \ +- mv -f $${dst} $${dst}.old ; \ +- else \ +- echo "Skipping config file $$x"; \ +- continue; \ +- fi ;\ ++ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`-dist ; \ ++ if [ ! -f $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` ]; then \ ++ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`; \ + fi ; \ +- echo "Installing file $$x"; \ +- $(INSTALL) -m 644 $$x $${dst} ;\ + done +- @if [ "$(OVERWRITE)" = "y" ] || [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \ ++ @if true; then \ + echo "Creating asterisk.conf"; \ + ( \ + echo "[directories](!) ; remove the (!) to enable this" ; \ +@@ -745,14 +736,17 @@ + echo "pbx_realtime=1.6" ; \ + echo "res_agi=1.6" ; \ + echo "app_set=1.6" ; \ +- ) > $(DESTDIR)$(ASTCONFPATH) ; \ ++ ) > $(DESTDIR)$(ASTCONFPATH)-dist ; \ ++ if [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \ ++ $(BSD_INSTALL_DATA) $(DESTDIR)$(ASTCONFPATH)-dist $(DESTDIR)$(ASTCONFPATH); \ ++ fi; \ + else \ + echo "Skipping asterisk.conf creation"; \ + fi +- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX ++ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX + build_tools/make_sample_voicemail $(DESTDIR)/$(ASTDATADIR) $(DESTDIR)/$(ASTSPOOLDIR) +- @mkdir -p $(DESTDIR)$(ASTDATADIR)/phoneprov +- @for x in phoneprov/*; do \ ++ @$(MKDIR) $(DESTDIR)$(ASTDATADIR)/phoneprov ++ for x in phoneprov/*; do \ + dst="$(DESTDIR)$(ASTDATADIR)/$$x" ; \ + if [ -f $${dst} ]; then \ + if [ "$(OVERWRITE)" = "y" ]; then \ +@@ -767,14 +761,14 @@ + fi ;\ + fi ; \ + echo "Installing file $$x"; \ +- $(INSTALL) -m 644 $$x $${dst} ;\ ++ $(BSD_INSTALL_DATA) $$x $${dst} ;\ + done + + webvmail: + @[ -d $(DESTDIR)$(HTTP_DOCSDIR)/ ] || ( printf "http docs directory not found.\nUpdate assignment of variable HTTP_DOCSDIR in Makefile!\n" && exit 1 ) + @[ -d $(DESTDIR)$(HTTP_CGIDIR) ] || ( printf "cgi-bin directory not found.\nUpdate assignment of variable HTTP_CGIDIR in Makefile!\n" && exit 1 ) + $(INSTALL) -m 4755 -o root -g root contrib/scripts/vmail.cgi $(DESTDIR)$(HTTP_CGIDIR)/vmail.cgi +- mkdir -p $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk ++ $(MKDIR) $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk + for x in images/*.gif; do \ + $(INSTALL) -m 644 $$x $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/; \ + done diff -ruN --exclude=CVS /usr/ports/net/asterisk16.orig/files/patch-Makefile.rules /usr/ports/net/asterisk16/files/patch-Makefile.rules --- /usr/ports/net/asterisk16.orig/files/patch-Makefile.rules 2010-09-21 07:42:50.000000000 +0200 +++ /usr/ports/net/asterisk16/files/patch-Makefile.rules 2010-09-21 13:18:06.000000000 +0200 @@ -1,15 +1,13 @@ - -$FreeBSD: ports/net/asterisk16/files/patch-Makefile.rules,v 1.3 2009/08/02 19:34:55 mezz Exp $ - ---- Makefile.rules -+++ Makefile.rules -@@ -35,7 +35,9 @@ - CMD_PREFIX= +--- Makefile.rules.orig 2010-05-05 15:59:28.000000000 +0600 ++++ Makefile.rules 2010-05-05 15:26:04.000000000 +0600 +@@ -43,6 +43,10 @@ + endif endif +ifneq ($(OSARCH),FreeBSD) - OPTIMIZE?=-O6 ++ OPTIMIZE?=-O6 +endif - ++ ifeq ($(findstring DONT_OPTIMIZE,$(MENUSELECT_CFLAGS)),) - # More GSM codec optimization + _ASTCFLAGS+=$(OPTIMIZE) + else diff -ruN --exclude=CVS /usr/ports/net/asterisk16.orig/files/patch-Makefile.rules.orig /usr/ports/net/asterisk16/files/patch-Makefile.rules.orig --- /usr/ports/net/asterisk16.orig/files/patch-Makefile.rules.orig 1970-01-01 01:00:00.000000000 +0100 +++ /usr/ports/net/asterisk16/files/patch-Makefile.rules.orig 2010-09-21 13:18:06.000000000 +0200 @@ -0,0 +1,15 @@ + +$FreeBSD: ports/net/asterisk16/files/patch-Makefile.rules,v 1.3 2009/08/02 19:34:55 mezz Exp $ + +--- Makefile.rules ++++ Makefile.rules +@@ -35,7 +35,9 @@ + CMD_PREFIX= + endif + ++ifneq ($(OSARCH),FreeBSD) + OPTIMIZE?=-O6 ++endif + + ifeq ($(findstring DONT_OPTIMIZE,$(MENUSELECT_CFLAGS)),) + # More GSM codec optimization diff -ruN --exclude=CVS /usr/ports/net/asterisk16.orig/files/patch-agi::Makefile.orig /usr/ports/net/asterisk16/files/patch-agi::Makefile.orig --- /usr/ports/net/asterisk16.orig/files/patch-agi::Makefile.orig 1970-01-01 01:00:00.000000000 +0100 +++ /usr/ports/net/asterisk16/files/patch-agi::Makefile.orig 2010-09-21 13:18:06.000000000 +0200 @@ -0,0 +1,28 @@ + +$FreeBSD: ports/net/asterisk16/files/patch-agi::Makefile,v 1.10 2009/08/02 19:34:55 mezz Exp $ + +--- agi/Makefile ++++ agi/Makefile +@@ -13,7 +13,9 @@ + + .PHONY: clean all uninstall + +-AGIS=agi-test.agi eagi-test eagi-sphinx-test jukebox.agi ++AGIS_BIN=eagi-test eagi-sphinx-test ++AGIS_SCR=agi-test.agi jukebox.agi ++AGIS=$(AGIS_SCR) $(AGIS_BIN) + + ifeq ($(OSARCH),SunOS) + LIBS+=-lsocket -lnsl +@@ -40,8 +42,9 @@ + eagi-sphinx-test: eagi-sphinx-test.o + + install: all +- mkdir -p $(DESTDIR)$(AGI_DIR) +- for x in $(AGIS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(AGI_DIR) ; done ++ $(MKDIR) -p $(DESTDIR)$(AGI_DIR) ++ for x in $(AGIS_BIN); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(AGI_DIR) ; done ++ for x in $(AGIS_SCR); do $(BSD_INSTALL_SCRIPT) $$x $(DESTDIR)$(AGI_DIR) ; done + + uninstall: + for x in $(AGIS); do rm -f $(DESTDIR)$(AGI_DIR)/$$x ; done diff -ruN --exclude=CVS /usr/ports/net/asterisk16.orig/files/patch-channels-chan_dahdi.c /usr/ports/net/asterisk16/files/patch-channels-chan_dahdi.c --- /usr/ports/net/asterisk16.orig/files/patch-channels-chan_dahdi.c 2010-09-21 07:42:50.000000000 +0200 +++ /usr/ports/net/asterisk16/files/patch-channels-chan_dahdi.c 2010-09-21 13:18:06.000000000 +0200 @@ -1,6 +1,6 @@ ---- channels/chan_dahdi.c.orig 2009-10-22 17:19:21.568250985 +0000 -+++ channels/chan_dahdi.c 2009-10-22 17:26:26.261584076 +0000 -@@ -1997,13 +1997,17 @@ +--- channels/chan_dahdi.c.orig 2010-05-05 17:50:15.000000000 +0600 ++++ channels/chan_dahdi.c 2010-05-05 17:50:09.000000000 +0600 +@@ -2672,13 +2672,17 @@ return; } if (p->echocancel.head.tap_length) { @@ -13,13 +13,13 @@ ast_log(LOG_WARNING, "Unable to enable audio mode on channel %d (%s)\n", p->channel, strerror(errno)); } - res = ioctl(p->subs[SUB_REAL].dfd, DAHDI_ECHOCANCEL_PARAMS, &p->echocancel); -+ ++ + pecp = &p->echocancel.head; + res = ioctl(p->subs[SUB_REAL].dfd, DAHDI_ECHOCANCEL_PARAMS, &pecp); - if (res) { + if (res) { ast_log(LOG_WARNING, "Unable to enable echo cancellation on channel %d (%s)\n", p->channel, strerror(errno)); } else { -@@ -2037,8 +2041,9 @@ +@@ -2712,8 +2716,9 @@ if (p->echocanon) { struct dahdi_echocanparams ecp = { .tap_length = 0 }; diff -ruN --exclude=CVS /usr/ports/net/asterisk16.orig/files/patch-channels::Makefile /usr/ports/net/asterisk16/files/patch-channels::Makefile --- /usr/ports/net/asterisk16.orig/files/patch-channels::Makefile 2010-09-21 07:42:50.000000000 +0200 +++ /usr/ports/net/asterisk16/files/patch-channels::Makefile 2010-09-21 13:18:06.000000000 +0200 @@ -1,8 +1,5 @@ - -$FreeBSD: ports/net/asterisk16/files/patch-channels::Makefile,v 1.18 2009/09/10 09:25:25 sobomax Exp $ - ---- channels/Makefile.orig -+++ channels/Makefile +--- channels/Makefile.orig 2010-05-05 17:57:22.000000000 +0600 ++++ channels/Makefile 2010-05-05 18:01:58.000000000 +0600 @@ -27,9 +27,10 @@ endif @@ -21,9 +18,9 @@ chan_h323.so: chan_h323.o h323/libchanh323.a $(ECHO_PREFIX) echo " [LD] $^ -> $@" +ifeq ($(OSARCH),FreeBSD) -+ $(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) -L$(PREFIX)/lib $(H323LDFLAGS) -o $@ $< h323/libchanh323.a $(H323LDLIBS) $(CHANH323LIB) ++ $(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) -L$(LOCALBASE)/lib $(H323LDFLAGS) -o $@ $< h323/libchanh323.a $(H323LDLIBS) $(CHANH323LIB) +else - $(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) -o $@ $< h323/libchanh323.a $(CHANH323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L$(OPENH323DIR)/lib $(H323LIB) -L/usr/lib -lcrypto -lssl -lexpat + $(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $(SOLINK) -o $@ $< h323/libchanh323.a $(CHANH323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L$(OPENH323DIR)/lib $(H323LIB) -L/usr/lib -lcrypto -lssl -lexpat endif endif +endif diff -ruN --exclude=CVS /usr/ports/net/asterisk16.orig/files/patch-channels::Makefile.orig /usr/ports/net/asterisk16/files/patch-channels::Makefile.orig --- /usr/ports/net/asterisk16.orig/files/patch-channels::Makefile.orig 1970-01-01 01:00:00.000000000 +0100 +++ /usr/ports/net/asterisk16/files/patch-channels::Makefile.orig 2010-09-21 13:18:06.000000000 +0200 @@ -0,0 +1,32 @@ + +$FreeBSD: ports/net/asterisk16/files/patch-channels::Makefile,v 1.18 2009/09/10 09:25:25 sobomax Exp $ + +--- channels/Makefile.orig ++++ channels/Makefile +@@ -27,9 +27,10 @@ + endif + + ifeq ($(OSARCH),FreeBSD) +- PTLIB=-lpt_FreeBSD_x86_r +- H323LIB=-lh323_FreeBSD_x86_r ++ PTLIB=-lpt_r ++ H323LIB=-lh323_r + CHANH323LIB=-pthread ++ H323LDLIBS=$(PTLIB) $(H323LIB) $(CHANH323LIB) + endif + + ifeq ($(OSARCH),NetBSD) +@@ -80,9 +81,13 @@ + else + chan_h323.so: chan_h323.o h323/libchanh323.a + $(ECHO_PREFIX) echo " [LD] $^ -> $@" ++ifeq ($(OSARCH),FreeBSD) ++ $(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) -L$(PREFIX)/lib $(H323LDFLAGS) -o $@ $< h323/libchanh323.a $(H323LDLIBS) $(CHANH323LIB) ++else + $(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) -o $@ $< h323/libchanh323.a $(CHANH323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L$(OPENH323DIR)/lib $(H323LIB) -L/usr/lib -lcrypto -lssl -lexpat + endif + endif ++endif + + chan_misdn.o: _ASTCFLAGS+=-Imisdn + diff -ruN --exclude=CVS /usr/ports/net/asterisk16.orig/files/patch-channels::chan_sip.c /usr/ports/net/asterisk16/files/patch-channels::chan_sip.c --- /usr/ports/net/asterisk16.orig/files/patch-channels::chan_sip.c 2010-09-21 07:42:50.000000000 +0200 +++ /usr/ports/net/asterisk16/files/patch-channels::chan_sip.c 2010-09-21 13:18:06.000000000 +0200 @@ -1,14 +1,11 @@ - -$FreeBSD: ports/net/asterisk16/files/patch-channels::chan_sip.c,v 1.13 2009/08/02 19:34:55 mezz Exp $ - ---- channels/chan_sip.c -+++ channels/chan_sip.c -@@ -611,7 +611,7 @@ - #define DEFAULT_MOHINTERPRET "default" +--- channels/chan_sip.c.orig 2010-05-28 23:57:40.000000000 +0600 ++++ channels/chan_sip.c 2010-08-11 10:47:07.000000000 +0600 +@@ -980,7 +980,7 @@ + #define DEFAULT_MOHINTERPRET "default" /*!< The default music class */ #define DEFAULT_MOHSUGGEST "" - #define DEFAULT_VMEXTEN "asterisk" --#define DEFAULT_CALLERID "asterisk" -+#define DEFAULT_CALLERID "Unknown" + #define DEFAULT_VMEXTEN "asterisk" /*!< Default voicemail extension */ +-#define DEFAULT_CALLERID "asterisk" /*!< Default caller ID */ ++#define DEFAULT_CALLERID "Unknown" /*!< Default caller ID */ #define DEFAULT_NOTIFYMIME "application/simple-message-summary" #define DEFAULT_ALLOWGUEST TRUE - #define DEFAULT_CALLCOUNTER FALSE + #define DEFAULT_RTPKEEPALIVE 0 /*!< Default RTPkeepalive setting */ diff -ruN --exclude=CVS /usr/ports/net/asterisk16.orig/files/patch-configure /usr/ports/net/asterisk16/files/patch-configure --- /usr/ports/net/asterisk16.orig/files/patch-configure 2010-09-21 07:42:50.000000000 +0200 +++ /usr/ports/net/asterisk16/files/patch-configure 2010-09-21 13:18:06.000000000 +0200 @@ -1,18 +1,16 @@ - -$FreeBSD: ports/net/asterisk16/files/patch-configure,v 1.8 2010/01/29 10:32:17 sobomax Exp $ - ---- configure.orig -+++ configure -@@ -4432,8 +4432,6 @@ +--- ./configure.orig 2010-07-17 23:43:50.000000000 +0600 ++++ ./configure 2010-08-24 09:37:46.000000000 +0600 +@@ -4147,9 +4147,6 @@ + case "${host_os}" in freebsd*) - ac_default_prefix=/usr/local +- - CPPFLAGS=-I/usr/local/include - LDFLAGS=-L/usr/local/lib ;; + openbsd*) - darwin*) -@@ -18784,7 +18782,7 @@ +@@ -34755,7 +34752,7 @@ fi @@ -20,4 +18,4 @@ + PLATFORM_OPENH323="h323_${OPENH323_SUFFIX}" if test "${HAS_OPENH323:-unset}" != "unset"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking OpenH323 installation validity" >&5 + { echo "$as_me:$LINENO: checking OpenH323 installation validity" >&5 diff -ruN --exclude=CVS /usr/ports/net/asterisk16.orig/files/patch-main::Makefile /usr/ports/net/asterisk16/files/patch-main::Makefile --- /usr/ports/net/asterisk16.orig/files/patch-main::Makefile 2010-09-21 07:42:50.000000000 +0200 +++ /usr/ports/net/asterisk16/files/patch-main::Makefile 1970-01-01 01:00:00.000000000 +0100 @@ -1,33 +0,0 @@ - -$FreeBSD: ports/net/asterisk16/files/patch-main::Makefile,v 1.8 2009/11/20 23:43:09 sobomax Exp $ - ---- main/Makefile.orig -+++ main/Makefile -@@ -101,8 +101,8 @@ - cd editline && test -f config.h || CFLAGS="$(PTHREAD_CFLAGS) $(subst $(ASTTOPDIR),../../,$(_ASTCFLAGS:-Werror=) $(ASTCFLAGS))" LDFLAGS="$(ASTLDFLAGS)" ./configure --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --with-ncurses=$(NCURSES_DIR) --with-curses=$(CURSES_DIR) --with-termcap=$(TERMCAP_DIR) --with-tinfo=$(TINFO_DIR) - $(MAKE) -C editline libedit.a - --db1-ast/libdb1.a: CHECK_SUBDIR -- _ASTCFLAGS="$(_ASTCFLAGS)" ASTCFLAGS="$(ASTCFLAGS) -Wno-strict-aliasing" $(MAKE) -C db1-ast libdb1.a -+#db1-ast/libdb1.a: CHECK_SUBDIR -+# _ASTCFLAGS="$(_ASTCFLAGS)" ASTCFLAGS="$(ASTCFLAGS) -Wno-strict-aliasing" $(MAKE) -C db1-ast libdb1.a - - ast_expr2.c ast_expr2.h: - bison -o $@ -d --name-prefix=ast_yy ast_expr2.y -@@ -159,13 +159,13 @@ - GMIMELDFLAGS+=$(GMIME_LIB) - endif - --$(MAIN_TGT): $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) -+$(MAIN_TGT): $(OBJS) editline/libedit.a $(AST_EMBED_LDSCRIPTS) - @$(CC) -c -o buildinfo.o $(_ASTCFLAGS) buildinfo.c $(ASTCFLAGS) - $(ECHO_PREFIX) echo " [LD] $^ -> $@" - ifneq ($(findstring chan_h323,$(MENUSELECT_CHANNELS)),) -- $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS) -+ $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(LDFLAGS) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS) - else -- $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS) -+ $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(LDFLAGS) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS) - endif - $(CMD_PREFIX) $(ASTTOPDIR)/build_tools/strip_nonapi $@ || rm $@ - diff -ruN --exclude=CVS /usr/ports/net/asterisk16.orig/files/patch-main::Makefile.orig /usr/ports/net/asterisk16/files/patch-main::Makefile.orig --- /usr/ports/net/asterisk16.orig/files/patch-main::Makefile.orig 1970-01-01 01:00:00.000000000 +0100 +++ /usr/ports/net/asterisk16/files/patch-main::Makefile.orig 2010-09-21 13:18:06.000000000 +0200 @@ -0,0 +1,33 @@ + +$FreeBSD: ports/net/asterisk16/files/patch-main::Makefile,v 1.8 2009/11/20 23:43:09 sobomax Exp $ + +--- main/Makefile.orig ++++ main/Makefile +@@ -101,8 +101,8 @@ + cd editline && test -f config.h || CFLAGS="$(PTHREAD_CFLAGS) $(subst $(ASTTOPDIR),../../,$(_ASTCFLAGS:-Werror=) $(ASTCFLAGS))" LDFLAGS="$(ASTLDFLAGS)" ./configure --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --with-ncurses=$(NCURSES_DIR) --with-curses=$(CURSES_DIR) --with-termcap=$(TERMCAP_DIR) --with-tinfo=$(TINFO_DIR) + $(MAKE) -C editline libedit.a + +-db1-ast/libdb1.a: CHECK_SUBDIR +- _ASTCFLAGS="$(_ASTCFLAGS)" ASTCFLAGS="$(ASTCFLAGS) -Wno-strict-aliasing" $(MAKE) -C db1-ast libdb1.a ++#db1-ast/libdb1.a: CHECK_SUBDIR ++# _ASTCFLAGS="$(_ASTCFLAGS)" ASTCFLAGS="$(ASTCFLAGS) -Wno-strict-aliasing" $(MAKE) -C db1-ast libdb1.a + + ast_expr2.c ast_expr2.h: + bison -o $@ -d --name-prefix=ast_yy ast_expr2.y +@@ -159,13 +159,13 @@ + GMIMELDFLAGS+=$(GMIME_LIB) + endif + +-$(MAIN_TGT): $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) ++$(MAIN_TGT): $(OBJS) editline/libedit.a $(AST_EMBED_LDSCRIPTS) + @$(CC) -c -o buildinfo.o $(_ASTCFLAGS) buildinfo.c $(ASTCFLAGS) + $(ECHO_PREFIX) echo " [LD] $^ -> $@" + ifneq ($(findstring chan_h323,$(MENUSELECT_CHANNELS)),) +- $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS) ++ $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(LDFLAGS) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS) + else +- $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS) ++ $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(LDFLAGS) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS) + endif + $(CMD_PREFIX) $(ASTTOPDIR)/build_tools/strip_nonapi $@ || rm $@ + diff -ruN --exclude=CVS /usr/ports/net/asterisk16.orig/files/patch-main__Makefile /usr/ports/net/asterisk16/files/patch-main__Makefile --- /usr/ports/net/asterisk16.orig/files/patch-main__Makefile 1970-01-01 01:00:00.000000000 +0100 +++ /usr/ports/net/asterisk16/files/patch-main__Makefile 2010-09-21 13:18:06.000000000 +0200 @@ -0,0 +1,30 @@ +--- ./main/Makefile.orig 2010-06-26 00:58:37.000000000 +0600 ++++ ./main/Makefile 2010-08-24 09:40:39.000000000 +0600 +@@ -113,8 +113,8 @@ + cd editline && test -f config.h || CFLAGS="$(PTHREAD_CFLAGS) $(subst $(ASTTOPDIR),../../,$(_ASTCFLAGS:-Werror=) $(ASTCFLAGS))" LDFLAGS="$(_ASTLDFLAGS) $(ASTLDFLAGS)" ./configure --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --with-ncurses=$(NCURSES_DIR) --with-curses=$(CURSES_DIR) --with-termcap=$(TERMCAP_DIR) --with-tinfo=$(TINFO_DIR) + $(MAKE) -C editline libedit.a + +-db1-ast/libdb1.a: CHECK_SUBDIR +- _ASTCFLAGS="$(_ASTCFLAGS) -Wno-strict-aliasing" ASTCFLAGS="$(ASTCFLAGS)" $(MAKE) -C db1-ast libdb1.a ++#db1-ast/libdb1.a: CHECK_SUBDIR ++# _ASTCFLAGS="$(_ASTCFLAGS) -Wno-strict-aliasing" ASTCFLAGS="$(ASTCFLAGS)" $(MAKE) -C db1-ast libdb1.a + + ifneq ($(findstring REBUILD_PARSERS,$(MENUSELECT_CFLAGS)),) + ast_expr2.c ast_expr2.h: ast_expr2.y +@@ -177,13 +177,13 @@ + GMIMELDFLAGS+=$(GMIME_LIB) + endif + +-$(MAIN_TGT): $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) ++$(MAIN_TGT): $(OBJS) editline/libedit.a $(AST_EMBED_LDSCRIPTS) + @$(CC) -c -o buildinfo.o $(_ASTCFLAGS) buildinfo.c $(ASTCFLAGS) + $(ECHO_PREFIX) echo " [LD] $^ -> $@" + ifneq ($(findstring chan_h323,$(MENUSELECT_CHANNELS)),) +- $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS) ++ $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(LDFLAGS) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS) + else +- $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS) ++ $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(LDFLAGS) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS) + endif + $(CMD_PREFIX) $(ASTTOPDIR)/build_tools/strip_nonapi $@ || rm $@ + diff -ruN --exclude=CVS /usr/ports/net/asterisk16.orig/pkg-plist /usr/ports/net/asterisk16/pkg-plist --- /usr/ports/net/asterisk16.orig/pkg-plist 2010-09-21 07:42:50.000000000 +0200 +++ /usr/ports/net/asterisk16/pkg-plist 2010-09-21 18:59:59.000000000 +0200 @@ -1,11 +1,21 @@ +@unexec if cmp -s %D/etc/asterisk/ais.conf %D/etc/asterisk/ais.conf-dist; then rm -f %D/etc/asterisk/ais.conf; fi +etc/asterisk/ais.conf-dist @unexec if cmp -s %D/etc/asterisk/cdr_adaptive_odbc.conf %D/etc/asterisk/cdr_adaptive_odbc.conf-dist; then rm -f %D/etc/asterisk/cdr_adaptive_odbc.conf; fi etc/asterisk/cdr_adaptive_odbc.conf-dist @unexec if cmp -s %D/etc/asterisk/cdr_sqlite3_custom.conf %D/etc/asterisk/cdr_sqlite3_custom.conf-dist; then rm -f %D/etc/asterisk/cdr_sqlite3_custom.conf; fi etc/asterisk/cdr_sqlite3_custom.conf-dist @unexec if cmp -s %D/etc/asterisk/cli.conf %D/etc/asterisk/cli.conf-dist; then rm -f %D/etc/asterisk/cli.conf; fi etc/asterisk/cli.conf-dist +@unexec if cmp -s %D/etc/asterisk/cli_aliases.conf %D/etc/asterisk/cli_aliases.conf-dist; then rm -f %D/etc/asterisk/cli_aliases.conf; fi +etc/asterisk/cli_aliases.conf-dist +@unexec if cmp -s %D/etc/asterisk/cli_permissions.conf %D/etc/asterisk/cli_permissions.conf-dist; then rm -f %D/etc/asterisk/cli_permissions.conf; fi +etc/asterisk/cli_permissions.conf-dist @unexec if cmp -s %D/etc/asterisk/console.conf %D/etc/asterisk/console.conf-dist; then rm -f %D/etc/asterisk/console.conf; fi etc/asterisk/console.conf-dist +@unexec if cmp -s %D/etc/asterisk/dbsep.conf %D/etc/asterisk/dbsep.conf-dist; then rm -f %D/etc/asterisk/dbsep.conf; fi +etc/asterisk/dbsep.conf-dist +@unexec if cmp -s %D/etc/asterisk/dsp.conf %D/etc/asterisk/dsp.conf-dist; then rm -f %D/etc/asterisk/dsp.conf; fi +etc/asterisk/dsp.conf-dist @unexec if cmp -s %D/etc/asterisk/extensions.lua %D/etc/asterisk/extensions.lua-dist; then rm -f %D/etc/asterisk/extensions.lua; fi etc/asterisk/extensions.lua-dist @unexec if cmp -s %D/etc/asterisk/extensions_minivm.conf %D/etc/asterisk/extensions_minivm.conf-dist; then rm -f %D/etc/asterisk/extensions_minivm.conf; fi @@ -146,6 +156,8 @@ etc/asterisk/followme.conf-dist @unexec if cmp -s %D/etc/asterisk/amd.conf %D/etc/asterisk/amd.conf-dist; then rm -f %D/etc/asterisk/amd.conf; fi etc/asterisk/amd.conf-dist +@unexec if cmp -s %D/etc/asterisk/res_config_sqlite.conf %D/etc/asterisk/res_config_sqlite.conf-dist; then rm -f %D/etc/asterisk/res_config_sqlite.conf; fi +etc/asterisk/res_config_sqlite.conf-dist @exec if test ! -e %D/etc/asterisk/cdr_adaptive_odbc.conf; then cp -p %D/etc/asterisk/cdr_adaptive_odbc.conf-dist %D/etc/asterisk/cdr_adaptive_odbc.conf; fi @exec if test ! -e %D/etc/asterisk/cdr_sqlite3_custom.conf; then cp -p %D/etc/asterisk/cdr_sqlite3_custom.conf-dist %D/etc/asterisk/cdr_sqlite3_custom.conf; fi @exec if test ! -e %D/etc/asterisk/cli.conf; then cp -p %D/etc/asterisk/cli.conf-dist %D/etc/asterisk/cli.conf; fi @@ -250,7 +262,11 @@ include/asterisk/astosp.h include/asterisk/audiohook.h include/asterisk/autoconfig.h +include/asterisk/bridging.h +include/asterisk/bridging_features.h +include/asterisk/bridging_technology.h include/asterisk/build.h +include/asterisk/buildinfo.h include/asterisk/buildopts.h include/asterisk/callerid.h include/asterisk/causes.h @@ -262,8 +278,10 @@ include/asterisk/compiler.h include/asterisk/config.h include/asterisk/crypto.h +include/asterisk/datastore.h include/asterisk/devicestate.h include/asterisk/dial.h +include/asterisk/dlinkedlists.h include/asterisk/dns.h include/asterisk/dnsmgr.h include/asterisk/doxyref.h @@ -276,6 +294,7 @@ include/asterisk/frame.h include/asterisk/fskmodem.h include/asterisk/global_datastores.h +include/asterisk/heap.h include/asterisk/http.h include/asterisk/image.h include/asterisk/indications.h @@ -304,16 +323,20 @@ include/asterisk/say.h include/asterisk/sched.h include/asterisk/sha1.h +include/asterisk/slin.h include/asterisk/slinfactory.h include/asterisk/smdi.h include/asterisk/speech.h include/asterisk/srv.h include/asterisk/stringfields.h include/asterisk/strings.h +include/asterisk/taskprocessor.h include/asterisk/tdd.h include/asterisk/term.h +include/asterisk/test.h include/asterisk/threadstorage.h include/asterisk/time.h +include/asterisk/timing.h include/asterisk/transcap.h include/asterisk/translate.h include/asterisk/udptl.h @@ -321,17 +344,30 @@ include/asterisk/unaligned.h include/asterisk/utils.h include/asterisk/version.h +include/asterisk/xml.h +include/asterisk/xmldoc.h +lib/asterisk/modules/app_confbridge.so lib/asterisk/modules/app_minivm.so -lib/asterisk/modules/app_pickupchan.so +lib/asterisk/modules/app_originate.so +lib/asterisk/modules/app_playtones.so lib/asterisk/modules/app_readexten.so lib/asterisk/modules/app_waituntil.so +lib/asterisk/modules/bridge_builtin_features.so +lib/asterisk/modules/bridge_multiplexed.so +lib/asterisk/modules/bridge_simple.so +lib/asterisk/modules/bridge_softmix.so %%WITH_ODBC%%lib/asterisk/modules/cdr_adaptive_odbc.so %%WITH_JABBER%%lib/asterisk/modules/chan_jingle.so +lib/asterisk/modules/chan_bridge.so lib/asterisk/modules/chan_unistim.so lib/asterisk/modules/codec_g722.so lib/asterisk/modules/format_sln16.so +lib/asterisk/modules/format_siren14.so +lib/asterisk/modules/format_siren7.so +lib/asterisk/modules/func_aes.so lib/asterisk/modules/func_audiohookinherit.so lib/asterisk/modules/func_blacklist.so +lib/asterisk/modules/func_config.so lib/asterisk/modules/func_devstate.so lib/asterisk/modules/func_dialgroup.so lib/asterisk/modules/func_dialplan.so @@ -340,17 +376,23 @@ lib/asterisk/modules/func_lock.so lib/asterisk/modules/func_module.so lib/asterisk/modules/func_shell.so +lib/asterisk/modules/func_speex.so +lib/asterisk/modules/func_sprintf.so lib/asterisk/modules/func_sysinfo.so lib/asterisk/modules/func_version.so lib/asterisk/modules/func_vmcount.so lib/asterisk/modules/func_volume.so lib/asterisk/modules/res_ael_share.so +lib/asterisk/modules/res_clialiases.so +%%WITH_CURL%%lib/asterisk/modules/res_curl.so %%WITH_CURL%%lib/asterisk/modules/res_config_curl.so lib/asterisk/modules/res_config_ldap.so %%WITH_SQLITE%%lib/asterisk/modules/res_config_sqlite.so lib/asterisk/modules/res_limit.so lib/asterisk/modules/res_phoneprov.so lib/asterisk/modules/res_realtime.so +%%WITH_DAHDI%%lib/asterisk/modules/res_timing_dahdi.so +lib/asterisk/modules/res_timing_pthread.so lib/asterisk/modules/app_adsiprog.so lib/asterisk/modules/app_alarmreceiver.so lib/asterisk/modules/app_amd.so @@ -481,7 +523,6 @@ %%WITH_POSTGRES%%lib/asterisk/modules/res_config_pgsql.so lib/asterisk/modules/res_convert.so lib/asterisk/modules/res_crypto.so -lib/asterisk/modules/res_indications.so %%WITH_JABBER%%lib/asterisk/modules/res_jabber.so lib/asterisk/modules/res_monitor.so lib/asterisk/modules/res_musiconhold.so @@ -498,6 +539,7 @@ sbin/astman sbin/autosupport sbin/muted +sbin/refcounter sbin/rasterisk sbin/safe_asterisk sbin/smsq @@ -507,9 +549,11 @@ share/asterisk/agi-bin/eagi-sphinx-test share/asterisk/agi-bin/eagi-test share/asterisk/agi-bin/jukebox.agi +share/asterisk/documentation/appdocsxml.dtd +share/asterisk/documentation/core-en_US.xml share/asterisk/keys/freeworlddialup.pub share/asterisk/keys/iaxtel.pub -share/asterisk/moh/.asterisk-moh-opsound-wav +share/asterisk/moh/.asterisk-moh-opsound-wav-2.03 share/asterisk/moh/CHANGES-asterisk-moh-opsound-wav share/asterisk/moh/CREDITS-asterisk-moh-opsound-wav share/asterisk/moh/LICENSE-asterisk-moh-opsound-wav @@ -522,12 +566,19 @@ share/asterisk/phoneprov/000000000000-phone.cfg share/asterisk/phoneprov/000000000000.cfg share/asterisk/phoneprov/polycom.xml -share/asterisk/sounds/.asterisk-core-sounds-en-gsm-1.4.17 -share/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.17 +share/asterisk/phoneprov/polycom_line.xml +share/asterisk/sounds/.asterisk-core-sounds-en-gsm-1.4.19 +share/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.19 +share/asterisk/sounds/en/ascending-2tone.gsm share/asterisk/sounds/en/conf-adminmenu-162.gsm share/asterisk/sounds/en/conf-extended.gsm share/asterisk/sounds/en/conf-nonextended.gsm +share/asterisk/sounds/en/conf-now-muted.gsm +share/asterisk/sounds/en/conf-now-recording.gsm +share/asterisk/sounds/en/conf-now-unmuted.gsm +share/asterisk/sounds/en/conf-roll-callcomplete.gsm share/asterisk/sounds/en/conf-usermenu-162.gsm +share/asterisk/sounds/en/descending-2tone.gsm share/asterisk/sounds/en/spy-dahdi.gsm share/asterisk/sounds/en/vm-Urgent.gsm share/asterisk/sounds/en/vm-forward-multiple.gsm @@ -538,8 +589,8 @@ share/asterisk/sounds/en/vm-record-prepend.gsm share/asterisk/sounds/en/vm-review-nonurgent.gsm share/asterisk/sounds/en/vm-review-urgent.gsm -share/asterisk/sounds/en/CHANGES-asterisk-core-en-1.4.17 -share/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.17 +share/asterisk/sounds/en/CHANGES-asterisk-core-en-1.4.19 +share/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.19 share/asterisk/sounds/en/dir-usingkeypad.gsm share/asterisk/sounds/en/dir-welcome.gsm share/asterisk/sounds/en/agent-alreadyon.gsm @@ -633,6 +684,7 @@ share/asterisk/sounds/en/digits/90.gsm share/asterisk/sounds/en/digits/a-m.gsm share/asterisk/sounds/en/digits/at.gsm +share/asterisk/sounds/en/digits/billion.gsm share/asterisk/sounds/en/digits/day-0.gsm share/asterisk/sounds/en/digits/day-1.gsm share/asterisk/sounds/en/digits/day-2.gsm @@ -657,11 +709,21 @@ share/asterisk/sounds/en/digits/h-3.gsm share/asterisk/sounds/en/digits/h-30.gsm share/asterisk/sounds/en/digits/h-4.gsm +share/asterisk/sounds/en/digits/h-40.gsm share/asterisk/sounds/en/digits/h-5.gsm +share/asterisk/sounds/en/digits/h-50.gsm share/asterisk/sounds/en/digits/h-6.gsm +share/asterisk/sounds/en/digits/h-60.gsm share/asterisk/sounds/en/digits/h-7.gsm +share/asterisk/sounds/en/digits/h-70.gsm share/asterisk/sounds/en/digits/h-8.gsm +share/asterisk/sounds/en/digits/h-80.gsm share/asterisk/sounds/en/digits/h-9.gsm +share/asterisk/sounds/en/digits/h-90.gsm +share/asterisk/sounds/en/digits/h-billion.gsm +share/asterisk/sounds/en/digits/h-hundred.gsm +share/asterisk/sounds/en/digits/h-million.gsm +share/asterisk/sounds/en/digits/h-thousand.gsm share/asterisk/sounds/en/digits/hundred.gsm share/asterisk/sounds/en/digits/million.gsm share/asterisk/sounds/en/digits/minus.gsm @@ -772,6 +834,7 @@ share/asterisk/sounds/en/minutes.gsm share/asterisk/sounds/en/pbx-invalid.gsm share/asterisk/sounds/en/pbx-invalidpark.gsm +share/asterisk/sounds/en/pbx-parkingfailed.gsm share/asterisk/sounds/en/pbx-transfer.gsm share/asterisk/sounds/en/phonetic/9_p.gsm share/asterisk/sounds/en/phonetic/a_p.gsm @@ -811,6 +874,7 @@ share/asterisk/sounds/en/queue-callswaiting.gsm share/asterisk/sounds/en/queue-holdtime.gsm share/asterisk/sounds/en/queue-less-than.gsm +share/asterisk/sounds/en/queue-minute.gsm share/asterisk/sounds/en/queue-minutes.gsm share/asterisk/sounds/en/queue-periodic-announce.gsm share/asterisk/sounds/en/queue-quantity1.gsm @@ -991,6 +1055,10 @@ %%DOCSDIR%%/img3.png %%DOCSDIR%%/img4.png %%DOCSDIR%%/img5.png +%%DOCSDIR%%/img6.png +%%DOCSDIR%%/img7.png +%%DOCSDIR%%/img8.png +%%DOCSDIR%%/img9.png %%DOCSDIR%%/index.html %%DOCSDIR%%/internals.pl %%DOCSDIR%%/labels.pl @@ -1195,6 +1263,25 @@ %%DOCSDIR%%/node278.html %%DOCSDIR%%/node279.html %%DOCSDIR%%/node28.html +%%DOCSDIR%%/node280.html +%%DOCSDIR%%/node281.html +%%DOCSDIR%%/node282.html +%%DOCSDIR%%/node283.html +%%DOCSDIR%%/node284.html +%%DOCSDIR%%/node285.html +%%DOCSDIR%%/node286.html +%%DOCSDIR%%/node287.html +%%DOCSDIR%%/node288.html +%%DOCSDIR%%/node289.html +%%DOCSDIR%%/node290.html +%%DOCSDIR%%/node291.html +%%DOCSDIR%%/node292.html +%%DOCSDIR%%/node293.html +%%DOCSDIR%%/node294.html +%%DOCSDIR%%/node295.html +%%DOCSDIR%%/node296.html +%%DOCSDIR%%/node297.html +%%DOCSDIR%%/node298.html %%DOCSDIR%%/node29.html %%DOCSDIR%%/node3.html %%DOCSDIR%%/node30.html @@ -1291,12 +1378,16 @@ @dirrm share/asterisk/keys @dirrm share/asterisk/firmware/iax @dirrm share/asterisk/firmware +@dirrm share/asterisk/documentation/thirdparty +@dirrm share/asterisk/documentation @dirrm share/asterisk/agi-bin @dirrm share/asterisk @dirrm lib/asterisk/modules @dirrm lib/asterisk @dirrm include/asterisk @dirrmtry etc/asterisk +@exec mkdir -p %D/share/asterisk/firmware/iax +@exec mkdir -p %D/share/asterisk/documentation/thirdparty @exec mkdir -p %D/share/asterisk/sounds/es @exec mkdir -p %D/share/asterisk/sounds/fr @cwd /var @@ -1304,15 +1395,18 @@ spool/asterisk/voicemail/default/1234/en/unavail.gsm @exec mkdir -p %D/log/asterisk/cdr-csv @exec mkdir -p %D/log/asterisk/cdr-custom -@exec mkdir -p %D/spool/asterisk/voicemail/default/1234/INBOX @exec mkdir -p %D/spool/asterisk/dictate @exec mkdir -p %D/spool/asterisk/meetme @exec mkdir -p %D/spool/asterisk/monitor @exec mkdir -p %D/spool/asterisk/system +@exec mkdir -p %D/spool/asterisk/voicemail/default/1234/INBOX +@exec mkdir -p %D/spool/asterisk/voicemail/default/1234/en @exec mkdir -p %D/spool/asterisk/tmp +@exec mkdir -p %D/db/asterisk @dirrm spool/asterisk/dictate @dirrm spool/asterisk/meetme @dirrm spool/asterisk/monitor +@dirrm spool/asterisk/outgoing @dirrm spool/asterisk/system @dirrm spool/asterisk/voicemail/default/1234/INBOX @dirrm spool/asterisk/voicemail/default/1234/en --------------030302080308090603070000--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201009211900.o8LJ0IX3030576>